From 86dc874d4b949c36ea11cdafb87919d3401ef1fb Mon Sep 17 00:00:00 2001
From: Jonathan Gillespie <jonathan.c.gillespie@gmail.com>
Date: Mon, 11 Jun 2018 20:32:55 +0200
Subject: [PATCH] Summer '18 Release (#10)

* Upgraded to SimpleMetadata v1.0.0
* Updated all Lightning components to API v43.0
* Updated all references to Apex properties to use PascalCase instead of camelCase
* Removed listViewMetadata.cmp & references
---
 src/aura/currentUser/currentUser.cmp-meta.xml |   2 +-
 .../environmentMetadata.cmp-meta.xml          |   2 +-
 src/aura/fieldLabel/fieldLabel.cmp            |   6 +-
 src/aura/fieldLabel/fieldLabel.cmp-meta.xml   |   2 +-
 .../fieldMetadata/fieldMetadata.cmp-meta.xml  |   2 +-
 src/aura/fieldMetadata/fieldMetadataHelper.js |   2 +-
 .../fieldSetMetadata.cmp-meta.xml             |   2 +-
 .../fieldSetMetadataHelper.js                 |   2 +-
 src/aura/inputField/inputField.cmp            |  34 +--
 src/aura/inputField/inputField.cmp-meta.xml   |   2 +-
 src/aura/inputField/inputFieldHelper.js       |  14 +-
 .../listViewMetadata/listViewMetadata.cmp     |  24 --
 .../listViewMetadata.cmp-meta.xml             |   5 -
 .../listViewMetadataController.js             |   5 -
 .../listViewMetadataHelper.js                 |  34 ---
 src/aura/lookup/lookup.cmp                    |  54 ++--
 src/aura/lookup/lookup.cmp-meta.xml           |   2 +-
 src/aura/lookup/lookupController.js           |  36 +--
 src/aura/lookup/lookupHelper.js               |  16 +-
 src/aura/modal/modal.cmp-meta.xml             |   2 +-
 .../objectPropertyValue.cmp-meta.xml          |   2 +-
 src/aura/outputField/outputField.cmp          |   4 +-
 src/aura/outputField/outputField.cmp-meta.xml |   2 +-
 src/aura/outputField/outputFieldHelper.js     |  12 +-
 .../queueMetadata/queueMetadata.cmp-meta.xml  |   2 +-
 src/aura/queueMetadata/queueMetadataHelper.js |   6 +-
 .../recordTypeMetadata/recordTypeMetadata.cmp |   2 +-
 .../recordTypeMetadata.cmp-meta.xml           |   2 +-
 src/aura/simpleAdmin/simpleAdmin.cmp          | 287 ++++++++----------
 src/aura/simpleAdmin/simpleAdmin.cmp-meta.xml |   2 +-
 src/aura/simpleAdmin/simpleAdminController.js |  12 +-
 src/aura/simpleAdmin/simpleAdminHelper.js     |   8 +-
 src/aura/sobjectLabel/sobjectLabel.cmp        |   4 +-
 .../sobjectLabel/sobjectLabel.cmp-meta.xml    |   2 +-
 src/aura/sobjectMetadata/sobjectMetadata.cmp  |   4 +-
 .../sobjectMetadata.cmp-meta.xml              |   2 +-
 .../sobjectMetadataController.js              |   2 +-
 .../sobjectMetadata/sobjectMetadataHelper.js  |   4 +-
 .../toastNotification.cmp-meta.xml            |   2 +-
 .../toastNotificationEvent.evt-meta.xml       |   2 +-
 src/classes/ContextMetadata.cls               |  31 ++
 ...-meta.xml => ContextMetadata.cls-meta.xml} |   2 +-
 src/classes/ContextMetadata_Tests.cls         |  48 +++
 ...xml => ContextMetadata_Tests.cls-meta.xml} |   2 +-
 src/classes/EnvironmentMetadata.cls           |  72 ++---
 src/classes/EnvironmentMetadata.cls-meta.xml  |   2 +-
 src/classes/EnvironmentMetadata_Tests.cls     |  64 ++--
 .../EnvironmentMetadata_Tests.cls-meta.xml    |   2 +-
 src/classes/FieldMetadata.cls                 | 162 +++++-----
 src/classes/FieldMetadata.cls-meta.xml        |   2 +-
 src/classes/FieldMetadata_Tests.cls           | 141 +++++----
 src/classes/FieldMetadata_Tests.cls-meta.xml  |   2 +-
 src/classes/FieldSetMetadata.cls              | 110 +++----
 src/classes/FieldSetMetadata.cls-meta.xml     |   2 +-
 src/classes/FieldSetMetadata_Tests.cls        |  34 +--
 .../FieldSetMetadata_Tests.cls-meta.xml       |   2 +-
 src/classes/LightningMetadataController.cls   |  34 +--
 .../LightningMetadataController.cls-meta.xml  |   2 +-
 .../LightningMetadataController_Tests.cls     |   8 +-
 ...tningMetadataController_Tests.cls-meta.xml |   2 +-
 src/classes/LimitsMetadata.cls                |  53 ++++
 ...s-meta.xml => LimitsMetadata.cls-meta.xml} |   2 +-
 src/classes/LimitsMetadata_Tests.cls          |  73 +++++
 ....xml => LimitsMetadata_Tests.cls-meta.xml} |   2 +-
 src/classes/ListViewMetadata.cls              |  67 ----
 src/classes/ListViewMetadata_Tests.cls        |  64 ----
 src/classes/LookupController.cls              |  40 +--
 src/classes/LookupController.cls-meta.xml     |   2 +-
 .../LookupController_Tests.cls-meta.xml       |   2 +-
 src/classes/QueueMetadata.cls                 |  83 ++---
 src/classes/QueueMetadata.cls-meta.xml        |   2 +-
 src/classes/QueueMetadata_Tests.cls           |  40 ++-
 src/classes/QueueMetadata_Tests.cls-meta.xml  |   2 +-
 src/classes/RecordTypeMetadata.cls            | 117 +++----
 src/classes/RecordTypeMetadata.cls-meta.xml   |   2 +-
 src/classes/RecordTypeMetadata_Tests.cls      |  80 ++---
 .../RecordTypeMetadata_Tests.cls-meta.xml     |   2 +-
 src/classes/SObjectMetadata.cls               | 147 ---------
 src/classes/SObjectMetadata_Tests.cls         | 108 -------
 src/classes/SobjectMetadata.cls               | 191 ++++++++++++
 src/classes/SobjectMetadata.cls-meta.xml      |   5 +
 src/classes/SobjectMetadata_Tests.cls         | 112 +++++++
 .../SobjectMetadata_Tests.cls-meta.xml        |   5 +
 src/package.xml                               |   2 +-
 84 files changed, 1258 insertions(+), 1280 deletions(-)
 delete mode 100644 src/aura/listViewMetadata/listViewMetadata.cmp
 delete mode 100644 src/aura/listViewMetadata/listViewMetadata.cmp-meta.xml
 delete mode 100644 src/aura/listViewMetadata/listViewMetadataController.js
 delete mode 100644 src/aura/listViewMetadata/listViewMetadataHelper.js
 create mode 100644 src/classes/ContextMetadata.cls
 rename src/classes/{ListViewMetadata.cls-meta.xml => ContextMetadata.cls-meta.xml} (80%)
 create mode 100644 src/classes/ContextMetadata_Tests.cls
 rename src/classes/{SObjectMetadata_Tests.cls-meta.xml => ContextMetadata_Tests.cls-meta.xml} (80%)
 create mode 100644 src/classes/LimitsMetadata.cls
 rename src/classes/{ListViewMetadata_Tests.cls-meta.xml => LimitsMetadata.cls-meta.xml} (80%)
 create mode 100644 src/classes/LimitsMetadata_Tests.cls
 rename src/classes/{SObjectMetadata.cls-meta.xml => LimitsMetadata_Tests.cls-meta.xml} (80%)
 delete mode 100644 src/classes/ListViewMetadata.cls
 delete mode 100644 src/classes/ListViewMetadata_Tests.cls
 delete mode 100644 src/classes/SObjectMetadata.cls
 delete mode 100644 src/classes/SObjectMetadata_Tests.cls
 create mode 100644 src/classes/SobjectMetadata.cls
 create mode 100644 src/classes/SobjectMetadata.cls-meta.xml
 create mode 100644 src/classes/SobjectMetadata_Tests.cls
 create mode 100644 src/classes/SobjectMetadata_Tests.cls-meta.xml

diff --git a/src/aura/currentUser/currentUser.cmp-meta.xml b/src/aura/currentUser/currentUser.cmp-meta.xml
index 392a2d7..ab250ad 100644
--- a/src/aura/currentUser/currentUser.cmp-meta.xml
+++ b/src/aura/currentUser/currentUser.cmp-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <AuraDefinitionBundle xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>42.0</apiVersion>
+    <apiVersion>43.0</apiVersion>
     <description>currentUser</description>
 </AuraDefinitionBundle>
diff --git a/src/aura/environmentMetadata/environmentMetadata.cmp-meta.xml b/src/aura/environmentMetadata/environmentMetadata.cmp-meta.xml
index 3108041..d6eb887 100644
--- a/src/aura/environmentMetadata/environmentMetadata.cmp-meta.xml
+++ b/src/aura/environmentMetadata/environmentMetadata.cmp-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <AuraDefinitionBundle xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>42.0</apiVersion>
+    <apiVersion>43.0</apiVersion>
     <description>environmentMetadata</description>
 </AuraDefinitionBundle>
diff --git a/src/aura/fieldLabel/fieldLabel.cmp b/src/aura/fieldLabel/fieldLabel.cmp
index 628c418..5bb57a5 100644
--- a/src/aura/fieldLabel/fieldLabel.cmp
+++ b/src/aura/fieldLabel/fieldLabel.cmp
@@ -5,9 +5,9 @@ See LICENSE file or go to https://github.com/jongpie/LightningComponents for ful
 <aura:component extends="c.fieldMetadata">
 
     <!-- Markup -->
-    <ui:outputText value="{!v.fieldMetadata.label}" />
-    <aura:if isTrue="{!v.fieldMetadata.inlineHelpText != null}">
-        <lightning:helptext iconName="utility:info" content="{!v.fieldMetadata.inlineHelpText}" />
+    <ui:outputText value="{!v.fieldMetadata.Label}" />
+    <aura:if isTrue="{!v.fieldMetadata.InlineHelpText != null}">
+        <lightning:helptext iconName="utility:info" content="{!v.fieldMetadata.InlineHelpText}" />
     </aura:if>
 
 </aura:component>
\ No newline at end of file
diff --git a/src/aura/fieldLabel/fieldLabel.cmp-meta.xml b/src/aura/fieldLabel/fieldLabel.cmp-meta.xml
index 5584483..1d85aab 100644
--- a/src/aura/fieldLabel/fieldLabel.cmp-meta.xml
+++ b/src/aura/fieldLabel/fieldLabel.cmp-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <AuraDefinitionBundle xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>41.0</apiVersion>
+    <apiVersion>43.0</apiVersion>
     <description>fieldLabel</description>
 </AuraDefinitionBundle>
diff --git a/src/aura/fieldMetadata/fieldMetadata.cmp-meta.xml b/src/aura/fieldMetadata/fieldMetadata.cmp-meta.xml
index 10dc88d..7e3030e 100644
--- a/src/aura/fieldMetadata/fieldMetadata.cmp-meta.xml
+++ b/src/aura/fieldMetadata/fieldMetadata.cmp-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <AuraDefinitionBundle xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>42.0</apiVersion>
+    <apiVersion>43.0</apiVersion>
     <description>fieldMetadata</description>
 </AuraDefinitionBundle>
diff --git a/src/aura/fieldMetadata/fieldMetadataHelper.js b/src/aura/fieldMetadata/fieldMetadataHelper.js
index 94daa3f..37c7589 100644
--- a/src/aura/fieldMetadata/fieldMetadataHelper.js
+++ b/src/aura/fieldMetadata/fieldMetadataHelper.js
@@ -7,7 +7,7 @@
 
         var params = event.getParam('arguments');
 
-        var action = component.get('c.getFieldMetadataByName');
+        var action = component.get('c.getFieldMetadataByApiName');
         action.setParams({
             sobjectApiName : sobjectApiName,
             fieldApiName   : fieldApiName
diff --git a/src/aura/fieldSetMetadata/fieldSetMetadata.cmp-meta.xml b/src/aura/fieldSetMetadata/fieldSetMetadata.cmp-meta.xml
index f41260d..fa7cfa8 100644
--- a/src/aura/fieldSetMetadata/fieldSetMetadata.cmp-meta.xml
+++ b/src/aura/fieldSetMetadata/fieldSetMetadata.cmp-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <AuraDefinitionBundle xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>42.0</apiVersion>
+    <apiVersion>43.0</apiVersion>
     <description>fieldSetMetadata</description>
 </AuraDefinitionBundle>
diff --git a/src/aura/fieldSetMetadata/fieldSetMetadataHelper.js b/src/aura/fieldSetMetadata/fieldSetMetadataHelper.js
index e924dd4..8a8378e 100644
--- a/src/aura/fieldSetMetadata/fieldSetMetadataHelper.js
+++ b/src/aura/fieldSetMetadata/fieldSetMetadataHelper.js
@@ -7,7 +7,7 @@
 
         var params = event.getParam('arguments');
 
-        var action = component.get('c.getFieldSetMetadataByName');
+        var action = component.get('c.getFieldSetMetadataByApiName');
         action.setParams({
             sobjectApiName  : component.get('v.sobjectApiName'),
             fieldSetApiName : component.get('v.fieldSetApiName')
diff --git a/src/aura/inputField/inputField.cmp b/src/aura/inputField/inputField.cmp
index a74f195..848cd5b 100644
--- a/src/aura/inputField/inputField.cmp
+++ b/src/aura/inputField/inputField.cmp
@@ -5,7 +5,7 @@ See LICENSE file or go to https://github.com/jongpie/LightningComponents for ful
 <aura:component extends="c.fieldMetadata">
 
     <!-- Public Attributes -->
-    <aura:attribute name="record" type="SObject" default="{}" />
+    <aura:attribute name="record" type="Sobject" default="{}" />
     <aura:attribute name="displayType" type="String" />
     <aura:attribute name="picklistOptions" type="Object[]" description="(Optional) List of picklist options, used when displayType == 'PICKLIST'" />
     <aura:attribute name="variant" type="String" default="form" description="Options: form (default) and bare" />
@@ -24,7 +24,7 @@ See LICENSE file or go to https://github.com/jongpie/LightningComponents for ful
     <aura:handler name="change" value="{!v.handleBlur}" action="{!c.handleFieldValueChanged}" />
 
     <!-- Markup -->
-    <aura:if isTrue="{!and(v.sobjectMetadata.isAccessible, v.fieldMetadata.isAccessible, v.render)}">
+    <aura:if isTrue="{!and(v.sobjectMetadata.IsAccessible, v.fieldMetadata.IsAccessible, v.render)}">
         <div class="slds-form-element">
             <aura:if isTrue="{!v.variant == 'form'}">
                 <label class="slds-form-element__label" for="{!v.auraId}">
@@ -52,7 +52,7 @@ See LICENSE file or go to https://github.com/jongpie/LightningComponents for ful
                     <div class="slds-form-element">
                         <label class="slds-checkbox_toggle slds-grid">
                         <!-- <span class="slds-form-element__label slds-m-bottom_none">Toggle Label</span> -->
-                        <ui:inputCheckbox value="{!v.fieldValue}" required="{!v.required}" disabled="{!or(v.fieldMetadata.isUpdateable == false, v.disabled)}" class="slds-input slds-checkbox uiInput--checkbox" />
+                        <ui:inputCheckbox value="{!v.fieldValue}" required="{!v.required}" disabled="{!or(v.fieldMetadata.IsUpdateable == false, v.disabled)}" class="slds-input slds-checkbox uiInput--checkbox" />
                         <span id="toggle-desc" class="slds-checkbox_faux_container" aria-live="assertive">
                             <span class="slds-checkbox_faux"></span>
                             <!-- <span class="slds-checkbox_on">Enabled</span>
@@ -64,95 +64,95 @@ See LICENSE file or go to https://github.com/jongpie/LightningComponents for ful
 
                 <!-- CURRENCY -->
                 <aura:if isTrue="{!v.displayType == 'CURRENCY'}">
-                    <ui:inputCurrency aura:id="inputField" value="{!v.fieldValue}" required="{!v.required}" disabled="{!or(v.fieldMetadata.isUpdateable == false, v.disabled)}" class="slds-input"
+                    <ui:inputCurrency aura:id="inputField" value="{!v.fieldValue}" required="{!v.required}" disabled="{!or(v.fieldMetadata.IsUpdateable == false, v.disabled)}" class="slds-input"
                         blur="{!c.handleBlur}"
                     />
                 </aura:if>
 
                 <!-- DATE -->
                 <aura:if isTrue="{!v.displayType == 'DATE'}">
-                    <ui:inputDate aura:id="inputField" value="{!v.fieldValue}" required="{!v.required}" disabled="{!or(v.fieldMetadata.isUpdateable == false, v.disabled)}" class="slds-input" displayDatePicker="true"
+                    <ui:inputDate aura:id="inputField" value="{!v.fieldValue}" required="{!v.required}" disabled="{!or(v.fieldMetadata.IsUpdateable == false, v.disabled)}" class="slds-input" displayDatePicker="true"
                         blur="{!c.handleBlur}"
                     />
                 </aura:if>
 
                 <!-- DATETIME -->
                 <aura:if isTrue="{!v.displayType == 'DATETIME'}">
-                    <ui:inputDatetime aura:id="inputField" value="{!v.fieldValue}" required="{!v.required}" disabled="{!or(v.fieldMetadata.isUpdateable == false, v.disabled)}" class="slds-input" displayDatePicker="true"
+                    <ui:inputDatetime aura:id="inputField" value="{!v.fieldValue}" required="{!v.required}" disabled="{!or(v.fieldMetadata.IsUpdateable == false, v.disabled)}" class="slds-input" displayDatePicker="true"
                         blur="{!c.handleBlur}"
                     />
                 </aura:if>
 
                 <!-- DOUBLE or INTEGER -->
                 <aura:if isTrue="{!or(v.displayType == 'DOUBLE', v.displayType == 'INTEGER')}">
-                     <ui:inputNumber aura:id="inputField" value="{!v.fieldValue}" required="{!v.required}" disabled="{!or(v.fieldMetadata.isUpdateable == false, v.disabled)}" class="slds-input"
+                     <ui:inputNumber aura:id="inputField" value="{!v.fieldValue}" required="{!v.required}" disabled="{!or(v.fieldMetadata.IsUpdateable == false, v.disabled)}" class="slds-input"
                         blur="{!c.handleBlur}"
                     />
                 </aura:if>
 
                 <!-- EMAIL -->
                 <aura:if isTrue="{!v.displayType == 'EMAIL'}">
-                    <ui:inputEmail aura:id="inputField" value="{!v.fieldValue}" required="{!v.required}" disabled="{!or(v.fieldMetadata.isUpdateable == false, v.disabled)}" class="slds-input" maxlength="{!v.fieldMetadata.maxLength}"
+                    <ui:inputEmail aura:id="inputField" value="{!v.fieldValue}" required="{!v.required}" disabled="{!or(v.fieldMetadata.IsUpdateable == false, v.disabled)}" class="slds-input" maxlength="{!v.fieldMetadata.MaxLength}"
                         blur="{!c.handleBlur}"
                     />
                 </aura:if>
 
                 <!-- ENCRYPTEDSTRING -->
                 <aura:if isTrue="{!v.displayType == 'ENCRYPTEDSTRING'}">
-                    <ui:inputSecret aura:id="inputField" value="{!v.fieldValue}" required="{!v.required}" disabled="{!or(v.fieldMetadata.isUpdateable == false, v.disabled)}" class="slds-input" maxlength="{!v.fieldMetadata.maxLength}"
+                    <ui:inputSecret aura:id="inputField" value="{!v.fieldValue}" required="{!v.required}" disabled="{!or(v.fieldMetadata.IsUpdateable == false, v.disabled)}" class="slds-input" maxlength="{!v.fieldMetadata.MaxLength}"
                         blur="{!c.handleBlur}"
                     />
                 </aura:if>
 
                 <!-- MULTIPICKLIST or PICKLIST -->
                 <aura:if isTrue="{!or(v.displayType == 'MULTIPICKLIST', v.displayType == 'PICKLIST')}">
-                    <ui:inputSelect aura:id="inputField" required="{!v.required}" disabled="{!or(v.fieldMetadata.isUpdateable == false, v.disabled)}" class="{!'slds-select ' + v.styleClass}"
+                    <ui:inputSelect aura:id="inputField" required="{!v.required}" disabled="{!or(v.fieldMetadata.IsUpdateable == false, v.disabled)}" class="{!'slds-select ' + v.styleClass}"
                         blur="{!c.handleBlur}" multiple="{!v.displayType == 'MULTIPICKLIST'}" change="{!c.handleFieldValueChanged}"
                     >
                         <aura:iteration items="{!v.picklistOptions}" var="picklistOption">
-                            <ui:inputSelectOption label="{!picklistOption.label}" text="{!picklistOption.value}" value="{!picklistOption.value == v.fieldValue}" />
+                            <ui:inputSelectOption label="{!picklistOption.Label}" text="{!picklistOption.Value}" value="{!picklistOption.Value == v.fieldValue}" />
                         </aura:iteration>
                     </ui:inputSelect>
                 </aura:if>
 
                 <!-- PERCENT -->
                 <aura:if isTrue="{!v.displayType == 'PERCENT'}">
-                     <ui:inputNumber aura:id="inputField" value="{!v.fieldValue}" required="{!v.required}" disabled="{!or(v.fieldMetadata.isUpdateable == false, v.disabled)}" class="slds-input"
+                     <ui:inputNumber aura:id="inputField" value="{!v.fieldValue}" required="{!v.required}" disabled="{!or(v.fieldMetadata.IsUpdateable == false, v.disabled)}" class="slds-input"
                         blur="{!c.handleBlur}"
                     />
                 </aura:if>
 
                 <!-- PHONE -->
                 <aura:if isTrue="{!v.displayType == 'PHONE'}">
-                    <ui:inputPhone aura:id="inputField" value="{!v.fieldValue}" required="{!v.required}" disabled="{!or(v.fieldMetadata.isUpdateable == false, v.disabled)}" class="slds-input" maxlength="{!v.fieldMetadata.maxLength}"
+                    <ui:inputPhone aura:id="inputField" value="{!v.fieldValue}" required="{!v.required}" disabled="{!or(v.fieldMetadata.IsUpdateable == false, v.disabled)}" class="slds-input" maxlength="{!v.fieldMetadata.MaxLength}"
                         blur="{!c.handleBlur}"
                     />
                 </aura:if>
 
                 <!-- REFERENCE -->
                 <aura:if isTrue="{!v.displayType == 'REFERENCE'}">
-                    <c:lookup sobjectApiName="{!v.sobjectApiName}" fieldApiName="{!v.fieldApiName}" required="{!v.required}" disabled="{!or(v.fieldMetadata.isUpdateable == false, v.disabled)}"
+                    <c:lookup sobjectApiName="{!v.sobjectApiName}" fieldApiName="{!v.fieldApiName}" required="{!v.required}" disabled="{!or(v.fieldMetadata.IsUpdateable == false, v.disabled)}"
                         record="{!v.record}"
                     />
                 </aura:if>
 
                 <!-- STRING -->
                 <aura:if isTrue="{!v.displayType == 'STRING'}">
-                    <ui:inputText aura:id="inputField" value="{!v.fieldValue}" required="{!v.required}" disabled="{!or(v.fieldMetadata.isUpdateable == false, v.disabled)}" class="slds-input" maxlength="{!v.fieldMetadata.maxLength}"
+                    <ui:inputText aura:id="inputField" value="{!v.fieldValue}" required="{!v.required}" disabled="{!or(v.fieldMetadata.IsUpdateable == false, v.disabled)}" class="slds-input" maxlength="{!v.fieldMetadata.MaxLength}"
                         blur="{!c.handleBlur}"
                     />
                 </aura:if>
 
                 <!-- TEXTAREA -->
                 <aura:if isTrue="{!v.displayType == 'TEXTAREA'}">
-                    <ui:inputTextArea aura:id="inputField" value="{!v.fieldValue}" required="{!v.required}" disabled="{!or(v.fieldMetadata.isUpdateable == false, v.disabled)}" class="slds-input" maxlength="{!v.fieldMetadata.maxLength}"
+                    <ui:inputTextArea aura:id="inputField" value="{!v.fieldValue}" required="{!v.required}" disabled="{!or(v.fieldMetadata.IsUpdateable == false, v.disabled)}" class="slds-input" maxlength="{!v.fieldMetadata.MaxLength}"
                         blur="{!c.handleBlur}"
                     />
                 </aura:if>
 
                 <!-- URL -->
                 <aura:if isTrue="{!v.displayType == 'URL'}">
-                    <ui:inputURL aura:id="inputField" value="{!v.fieldValue}" required="{!v.required}" disabled="{!or(v.fieldMetadata.isUpdateable == false, v.disabled)}" class="slds-input" maxlength="{!v.fieldMetadata.maxLength}"
+                    <ui:inputURL aura:id="inputField" value="{!v.fieldValue}" required="{!v.required}" disabled="{!or(v.fieldMetadata.IsUpdateable == false, v.disabled)}" class="slds-input" maxlength="{!v.fieldMetadata.MaxLength}"
                         blur="{!c.handleBlur}"
                     />
                 </aura:if>
diff --git a/src/aura/inputField/inputField.cmp-meta.xml b/src/aura/inputField/inputField.cmp-meta.xml
index 8e9f3ef..1d8f5ca 100644
--- a/src/aura/inputField/inputField.cmp-meta.xml
+++ b/src/aura/inputField/inputField.cmp-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <AuraDefinitionBundle xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>42.0</apiVersion>
+    <apiVersion>43.0</apiVersion>
     <description>inputField</description>
 </AuraDefinitionBundle>
diff --git a/src/aura/inputField/inputFieldHelper.js b/src/aura/inputField/inputFieldHelper.js
index 0c5930d..d8930aa 100644
--- a/src/aura/inputField/inputFieldHelper.js
+++ b/src/aura/inputField/inputFieldHelper.js
@@ -4,14 +4,14 @@
         var fieldMetadata = component.get('v.fieldMetadata');
 
         if(component.get('v.displayType') === undefined) {
-            component.set('v.displayType', fieldMetadata.displayType);
+            component.set('v.displayType', fieldMetadata.DisplayType);
         }
         if(component.get('v.disabled') === undefined) {
-            component.set('v.disabled', fieldMetadata.isUpdateable == false);
+            component.set('v.disabled', fieldMetadata.IsUpdateable == false);
         }
         if(component.get('v.required') === undefined) {
-            var isUpdateableRequired = fieldMetadata.isUpdateable && fieldMetadata.isRequired;
-            var isUpdateableNameField = fieldMetadata.isUpdateable && fieldMetadata.isNameField;
+            var isUpdateableRequired = fieldMetadata.IsUpdateable && fieldMetadata.IsRequired;
+            var isUpdateableNameField = fieldMetadata.IsUpdateable && fieldMetadata.IsNameField;
             component.set('v.required', isUpdateableRequired || isUpdateableNameField);
         }
         this.parsePicklistOptions(component, event);
@@ -34,7 +34,7 @@
 
             if(fieldMetadata == null) return;
 
-            picklistOptions = fieldMetadata.picklistOptions;
+            picklistOptions = fieldMetadata.PicklistOptions;
         }
         component.set('v.picklistOptions', picklistOptions);
     },
@@ -51,14 +51,14 @@
 
         var fieldChanged = newFieldValue !== oldFieldValue;
         // If the displayType is different from the field metadata and it should be a string, then cast to strings and compare to see if the field changed
-        if(newFieldValue !== null && typeof newFieldValue !== 'string' && fieldMetadata != null && (fieldMetadata.displayType === 'TEXT' || fieldMetadata.displayType === 'TEXTAREA')) {
+        if(newFieldValue !== null && typeof newFieldValue !== 'string' && fieldMetadata != null && (fieldMetadata.DisplayType === 'TEXT' || fieldMetadata.DisplayType === 'TEXTAREA')) {
             var newFieldValueString = newFieldValue == null ? null : newFieldValue.toString();
             var oldFieldValueString = oldFieldValue == null ? null : oldFieldValue.toString();
             fieldChanged = newFieldValueString !== oldFieldValueString;
         }
 
         if(fieldChanged) {
-            if(newFieldValue !== null && typeof newFieldValue !== 'string' && fieldMetadata != null && (fieldMetadata.displayType === 'TEXT' || fieldMetadata.displayType === 'TEXTAREA')) {
+            if(newFieldValue !== null && typeof newFieldValue !== 'string' && fieldMetadata != null && (fieldMetadata.DisplayType === 'TEXT' || fieldMetadata.DisplayType === 'TEXTAREA')) {
                 newFieldValue = newFieldValue.toString();
             }
             record[changedField] = newFieldValue;
diff --git a/src/aura/listViewMetadata/listViewMetadata.cmp b/src/aura/listViewMetadata/listViewMetadata.cmp
deleted file mode 100644
index 4db2fb6..0000000
--- a/src/aura/listViewMetadata/listViewMetadata.cmp
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-This file is part of the Simple Lightning Components project, released under the MIT License.
-See LICENSE file or go to https://github.com/jongpie/LightningComponents for full license details.
--->
-<aura:component extends="c.sobjectMetadata" extensible="true" controller="LightningMetadataController">
-
-    <!-- Public Attributes -->
-    <aura:attribute name="listViewApiName" type="String" required="true" description="The API name of the field set"  />
-    <aura:attribute name="listViewMetadata" type="ListViewMetadata" description="The field set metadata object returned from the controller" />
-
-    <!-- Public Methods -->
-    <aura:method name="fetch" action="{!c.doInit}" description="(Optional) Callback function to use after fetching the metadata">
-        <aura:attribute name="callback" type="function"/>
-    </aura:method>
-
-    <!-- Handlers -->
-    <aura:handler name="init" value="{!this}" action="{!c.doInit}" />
-    <aura:handler name="change" value="{!v.sobjectApiName}" action="{!c.doInit}" />
-    <aura:handler name="change" value="{!v.listViewApiName}" action="{!c.doInit}" />
-
-    <!-- Markup -->
-    {!v.body}
-
-</aura:component>
\ No newline at end of file
diff --git a/src/aura/listViewMetadata/listViewMetadata.cmp-meta.xml b/src/aura/listViewMetadata/listViewMetadata.cmp-meta.xml
deleted file mode 100644
index 30ea476..0000000
--- a/src/aura/listViewMetadata/listViewMetadata.cmp-meta.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<AuraDefinitionBundle xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>42.0</apiVersion>
-    <description>listViewMetadata</description>
-</AuraDefinitionBundle>
diff --git a/src/aura/listViewMetadata/listViewMetadataController.js b/src/aura/listViewMetadata/listViewMetadataController.js
deleted file mode 100644
index a8d9566..0000000
--- a/src/aura/listViewMetadata/listViewMetadataController.js
+++ /dev/null
@@ -1,5 +0,0 @@
-({
-    doInit : function(component, event, helper) {
-        helper.fetchListViewMetadata(component, event);
-    }
-})
\ No newline at end of file
diff --git a/src/aura/listViewMetadata/listViewMetadataHelper.js b/src/aura/listViewMetadata/listViewMetadataHelper.js
deleted file mode 100644
index 7c7664e..0000000
--- a/src/aura/listViewMetadata/listViewMetadataHelper.js
+++ /dev/null
@@ -1,34 +0,0 @@
-({
-    fetchListViewMetadata : function(component, event) {
-        var sobjectApiName  = component.get('v.sobjectApiName');
-        var listViewApiName = component.get('v.listViewApiName');
-
-        if(!sobjectApiName || !listViewApiName) return;
-
-        var params = event.getParam('arguments');
-
-        var action = component.get('c.getListViewMetadataByName');
-        action.setParams({
-            sobjectApiName  : sobjectApiName,
-            listViewApiName : listViewApiName
-        });
-        action.setStorable();
-        action.setCallback(this, function(response) {
-            if(response.getState() === 'SUCCESS') {
-                var listViewMetadata = response.getReturnValue();
-                component.set('v.listViewMetadata', listViewMetadata);
-
-                if(params) params.callback(null, listViewMetadata);
-            } else if(response.getState() === 'ERROR') {
-                this.processCallbackErrors(response);
-            }
-        });
-        $A.enqueueAction(action);
-    },
-    processCallbackErrors : function(response) {
-        console.log('ERROR');
-        for(var i=0; i < response.getError().length; i++) {
-           console.log(response.getError()[i]);
-        }
-    }
-})
\ No newline at end of file
diff --git a/src/aura/lookup/lookup.cmp b/src/aura/lookup/lookup.cmp
index 198c147..149923b 100644
--- a/src/aura/lookup/lookup.cmp
+++ b/src/aura/lookup/lookup.cmp
@@ -5,19 +5,19 @@ See LICENSE file or go to https://github.com/jongpie/LightningComponents for ful
 <aura:component extends="c.fieldMetadata" controller="LookupController">
 
     <!-- Public Config Attributes -->
-    <aura:attribute name="record" type="SObject" default="{}" />
+    <aura:attribute name="record" type="Sobject" default="{}" />
     <aura:attribute name="disabled" type="Boolean" description="(Optional) Disables the input field" />
     <aura:attribute name="required" type="Boolean" description="(Optional) Marks the field as required (true) or optional (false)" />
     <aura:attribute name="limitCount" type="Integer" default="5" description="Total number of records to return" />
 
     <!-- Private Selected Record Attributes -->
     <aura:attribute name="selectedParentRecordId" type="Id" access="private" />
-    <aura:attribute name="selectedParentRecord" type="SObject" access="private" />
+    <aura:attribute name="selectedParentRecord" type="Sobject" access="private" />
 
-    <!-- Private SObject Selector Attributes -->
-    <aura:attribute name="showSObjectSelector" type="Boolean" access="private" default="false" />
-    <aura:attribute name="parentSObjectApiName" type="String" access="private" />
-    <aura:attribute name="parentSObjectMetadata" type="SObjectMetadata" access="private" />
+    <!-- Private Sobject Selector Attributes -->
+    <aura:attribute name="showSobjectSelector" type="Boolean" access="private" default="false" />
+    <aura:attribute name="parentSobjectApiName" type="String" access="private" />
+    <aura:attribute name="parentSobjectMetadata" type="SobjectMetadata" access="private" />
 
     <!-- Private Search Result Attributes -->
     <aura:attribute name="showSearchResults" type="Boolean" access="private" default="false" />
@@ -27,29 +27,29 @@ See LICENSE file or go to https://github.com/jongpie/LightningComponents for ful
     <aura:handler name="init" value="{!this}" action="{!c.doInit}" />
     <aura:handler name="change" value="{!v.fieldMetadata}" action="{!c.parseFieldMetadata}" />
     <aura:handler name="change" value="{!v.selectedParentRecordId}" action="{!c.loadSelectedParentRecord}" />
-    <aura:handler name="change" value="{!v.parentSObjectApiName}" action="{!c.loadParentSObjectMetadata}" />
+    <aura:handler name="change" value="{!v.parentSobjectApiName}" action="{!c.loadParentSobjectMetadata}" />
 
     <!-- Markup -->
     <div class="slds-form-element">
         <div class="slds-form-element__control">
             <div class="slds-combobox_container slds-has-object-switcher">
-                <!-- SObject Switcher -->
-                <aura:if isTrue="{! and(empty(v.selectedParentRecord), v.fieldMetadata.relationshipReferences.length > 1)}">
+                <!-- Sobject Switcher -->
+                <aura:if isTrue="{! and(empty(v.selectedParentRecord), v.fieldMetadata.RelationshipReferences.length > 1)}">
                     <div class="slds-listbox_object-switcher slds-dropdown-trigger slds-dropdown-trigger_click slds-is-open">
-                        <button class="slds-button slds-button_icon" aria-haspopup="true" title="Select object to search in" onclick="{!c.toggleParentSObjectSelector}">
-                            <lightning:icon iconName="{!v.parentSObjectMetadata.tabIcon}" size="small" />
+                        <button class="slds-button slds-button_icon" aria-haspopup="true" title="Select object to search in" onclick="{!c.toggleParentSobjectSelector}">
+                            <lightning:icon iconName="{!v.parentSobjectMetadata.TabIcon}" size="small" />
                             <lightning:icon iconName="utility:down" size="x-small" />
                         </button>
-                        <aura:if isTrue="{!v.showSObjectSelector}">
+                        <aura:if isTrue="{!v.showSobjectSelector}">
                             <div class="slds-dropdown slds-dropdown_left slds-dropdown_small">
                                 <ul class="slds-dropdown__list" role="menu">
-                                    <aura:iteration items="{!v.fieldMetadata.relationshipReferences}" var="relationshipReference">
-                                        <aura:if isTrue="{!relationshipReference.isAccessible}">
+                                    <aura:iteration items="{!v.fieldMetadata.RelationshipReferences}" var="relationshipReference">
+                                        <aura:if isTrue="{!relationshipReference.IsAccessible}">
                                             <li class="slds-dropdown__item slds-is-selected" role="presentation">
-                                                <a href="javascript:void(0);" role="menuitemcheckbox" aria-checked="true" tabindex="0" data-sobjectapiname="{!relationshipReference.apiName}" onclick="{!c.selectParentSObject}">
-                                                    <span class="slds-truncate" title="{!relationshipReference.labelPlural}">
-                                                        <lightning:icon iconName="{!relationshipReference.tabIcon}" size="large" />
-                                                        &nbsp;{!relationshipReference.labelPlural}
+                                                <a href="javascript:void(0);" role="menuitemcheckbox" aria-checked="true" tabindex="0" data-sobjectapiname="{!relationshipReference.ApiName}" onclick="{!c.selectParentSobject}">
+                                                    <span class="slds-truncate" title="{!relationshipReference.LabelPlural}">
+                                                        <lightning:icon iconName="{!relationshipReference.TabIcon}" size="large" />
+                                                        &nbsp;{!relationshipReference.LabelPlural}
                                                     </span>
                                                 </a>
                                             </li>
@@ -69,12 +69,12 @@ See LICENSE file or go to https://github.com/jongpie/LightningComponents for ful
                                 aria-controls="listbox-unique-id"
                                 autocomplete="off"
                                 class="slds-input slds-combobox__input"
-                                disabled="{!or(empty(v.parentSObjectMetadata), v.fieldMetadata.isUpdateable == false, v.disabled)}"
+                                disabled="{!or(empty(v.parentSobjectMetadata), v.fieldMetadata.IsUpdateable == false, v.disabled)}"
                                 id="combobox-unique-id"
                                 onfocus="{!c.fetchSearchResults}"
                                 onkeyup="{!c.fetchSearchResults}"
-                                placeholder="{! if(empty(v.parentSObjectMetadata), '', v.parentSObjectMetadata.labelPlural) }"
-                                required="{!or(v.required, v.fieldMetadata.required)}"
+                                placeholder="{! if(empty(v.parentSobjectMetadata), '', v.parentSobjectMetadata.LabelPlural) }"
+                                required="{!or(v.required, v.fieldMetadata.Required)}"
                                 role="textbox"
                                 type="text"
                             />
@@ -83,9 +83,9 @@ See LICENSE file or go to https://github.com/jongpie/LightningComponents for ful
                             </span>
                             <aura:set attribute="else">
                                 <span class="slds-pill slds-pill_link">
-                                    <a href="javascript:void(0);" class="slds-pill__action slds-p-left_x-small" title="{#v.selectedParentRecord.displayText}">
-                                        <lightning:icon iconName="{!v.parentSObjectMetadata.tabIcon}" size="x-small" />
-                                        <span class="slds-pill__label slds-p-left_x-small">{#v.selectedParentRecord.displayText}</span>
+                                    <a href="javascript:void(0);" class="slds-pill__action slds-p-left_x-small" title="{#v.selectedParentRecord.DisplayText}">
+                                        <lightning:icon iconName="{!v.parentSobjectMetadata.TabIcon}" size="x-small" />
+                                        <span class="slds-pill__label slds-p-left_x-small">{#v.selectedParentRecord.DisplayText}</span>
                                     </a>
                                     <button class="slds-button slds-button_icon slds-button_icon slds-pill__remove" title="Remove" onclick="{!c.clearSelection}" >
                                         <lightning:icon iconName="utility:close" size="small" />
@@ -104,12 +104,12 @@ See LICENSE file or go to https://github.com/jongpie/LightningComponents for ful
                                         <span role="option" class="slds-media slds-listbox__option slds-listbox__option_entity slds-listbox__option_has-meta">
                                             <span class="slds-media__figure optionIcon">
                                                 <span class="slds-icon_container" >
-                                                    <lightning:icon iconName="{#v.parentSObjectMetadata.tabIcon}" size="small" />
-                                                    <span class="slds-assistive-text">{!v.parentSObjectMetadata.label}</span>
+                                                    <lightning:icon iconName="{#v.parentSobjectMetadata.TabIcon}" size="small" />
+                                                    <span class="slds-assistive-text">{!v.parentSobjectMetadata.Label}</span>
                                                 </span>
                                             </span>
                                             <span class="slds-media__body">
-                                                <span class="slds-listbox__option-text slds-listbox__option-text_entity">{!matchingRecord.displayText}</span>
+                                                <span class="slds-listbox__option-text slds-listbox__option-text_entity">{!matchingRecord.DisplayText}</span>
                                             </span>
                                         </span>
                                     </li>
diff --git a/src/aura/lookup/lookup.cmp-meta.xml b/src/aura/lookup/lookup.cmp-meta.xml
index 4974878..0e508bc 100644
--- a/src/aura/lookup/lookup.cmp-meta.xml
+++ b/src/aura/lookup/lookup.cmp-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <AuraDefinitionBundle xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>42.0</apiVersion>
+    <apiVersion>43.0</apiVersion>
     <description>lookup</description>
 </AuraDefinitionBundle>
diff --git a/src/aura/lookup/lookupController.js b/src/aura/lookup/lookupController.js
index dbc8190..05f8426 100644
--- a/src/aura/lookup/lookupController.js
+++ b/src/aura/lookup/lookupController.js
@@ -12,41 +12,41 @@
         if(!fieldMetadata) return;
 
         var defaultRelationshipReference;
-        for(var i = 0; i < fieldMetadata.relationshipReferences.length; i++) {
-            var relationshipReference = fieldMetadata.relationshipReferences[i];
+        for(var i = 0; i < fieldMetadata.RelationshipReferences.length; i++) {
+            var relationshipReference = fieldMetadata.RelationshipReferences[i];
 
-            if(relationshipReference.isAccessible === true) {
+            if(relationshipReference.IsAccessible === true) {
                 defaultRelationshipReference = relationshipReference;
                 break;
             }
         }
-        component.set('v.parentSObjectApiName', defaultRelationshipReference.apiName);
+        component.set('v.parentSobjectApiName', defaultRelationshipReference.ApiName);
     },
-    toggleParentSObjectSelector : function(component, event, helper) {
-        component.set('v.showSObjectSelector', !component.get('v.showSObjectSelector'));
+    toggleParentSobjectSelector : function(component, event, helper) {
+        component.set('v.showSobjectSelector', !component.get('v.showSobjectSelector'));
         component.set('v.showSearchResults', !component.get('v.showSearchResults'));
     },
-    selectParentSObject : function(component, event, helper) {
-        var parentSObjectApiName = event.currentTarget.dataset.sobjectapiname;
-        component.set('v.parentSObjectApiName', parentSObjectApiName);
-        component.set('v.showSObjectSelector', false);
+    selectParentSobject : function(component, event, helper) {
+        var parentSobjectApiName = event.currentTarget.dataset.sobjectapiname;
+        component.set('v.parentSobjectApiName', parentSobjectApiName);
+        component.set('v.showSobjectSelector', false);
     },
-    loadParentSObjectMetadata : function(component, event, helper) {
+    loadParentSobjectMetadata : function(component, event, helper) {
         component.set('v.searchResults', null);
 
         var fieldMetadata = component.get('v.fieldMetadata');
-        var parentSObjectApiName = component.get('v.parentSObjectApiName');
+        var parentSobjectApiName = component.get('v.parentSobjectApiName');
 
-        var selectedSObjectMetadata;
-        for(var i = 0; i < fieldMetadata.relationshipReferences.length; i++) {
-            var relationshipReference = fieldMetadata.relationshipReferences[i];
+        var selectedSobjectMetadata;
+        for(var i = 0; i < fieldMetadata.RelationshipReferences.length; i++) {
+            var relationshipReference = fieldMetadata.RelationshipReferences[i];
 
-            if(relationshipReference.apiName !== parentSObjectApiName) continue;
+            if(relationshipReference.ApiName !== parentSobjectApiName) continue;
 
-            selectedSObjectMetadata = fieldMetadata.relationshipReferences[i];
+            selectedSobjectMetadata = fieldMetadata.RelationshipReferences[i];
             break;
         }
-        component.set('v.parentSObjectMetadata', selectedSObjectMetadata);
+        component.set('v.parentSobjectMetadata', selectedSobjectMetadata);
     },
     loadSelectedParentRecord :  function(component, event, helper) {
         var selectedParentRecordId = component.get('v.selectedParentRecordId');
diff --git a/src/aura/lookup/lookupHelper.js b/src/aura/lookup/lookupHelper.js
index 78149d7..d955ec9 100644
--- a/src/aura/lookup/lookupHelper.js
+++ b/src/aura/lookup/lookupHelper.js
@@ -1,6 +1,6 @@
 ({
     fetchSelectedParentRecord : function(component, event, helper) {
-        var parentSObjectMetadata = component.get('v.parentSObjectMetadata');
+        var parentSobjectMetadata = component.get('v.parentSobjectMetadata');
         var action = component.get('c.getRecord');
         action.setParams({
             recordId : component.get('v.selectedParentRecordId')
@@ -9,7 +9,7 @@
         action.setCallback(this, function(response) {
             if(response.getState() === 'SUCCESS') {
                 component.set('v.selectedParentRecord', response.getReturnValue());
-                component.set('v.parentSObjectApiName', response.getReturnValue().sobjectApiName);
+                component.set('v.parentSobjectApiName', response.getReturnValue().sobjectApiName);
             } else if(response.getState() === 'ERROR') {
                 var errors = response.getError();
                 if(errors && errors[0] && errors[0].message) {
@@ -26,13 +26,13 @@
         if(event.keyCode == escapeKeyCode) {
             helper.clearSelection(component, event, helper);
         } else {
-            var parentSObjectMetadata = component.get('v.parentSObjectMetadata');
+            var parentSobjectMetadata = component.get('v.parentSobjectMetadata');
             var action = component.get('c.search');
             action.setParams({
-                parentSObjectApiName : parentSObjectMetadata.apiName,
-                searchFieldApiName   : parentSObjectMetadata.displayFieldApiName,
+                parentSobjectApiName : parentSobjectMetadata.ApiName,
+                searchFieldApiName   : parentSobjectMetadata.DisplayFieldApiName,
                 searchText           : searchText,
-                displayFieldApiName  : parentSObjectMetadata.displayFieldApiName,
+                displayFieldApiName  : parentSobjectMetadata.DisplayFieldApiName,
                 limitCount           : component.get('v.limitCount')
             });
             action.setStorable();
@@ -57,8 +57,8 @@
             var fieldApiName = component.get('v.fieldApiName');
             var selectedParentRecord = searchResults[selectedParentRecordIndex];
 
-            if(selectedParentRecord.record) {
-                record[fieldApiName] = selectedParentRecord.record.Id;
+            if(selectedParentRecord.Record) {
+                record[fieldApiName] = selectedParentRecord.Record.Id;
                 component.set('v.selectedParentRecord', selectedParentRecord);
             }
             component.set('v.searchResults', null);
diff --git a/src/aura/modal/modal.cmp-meta.xml b/src/aura/modal/modal.cmp-meta.xml
index c2325c4..a7402ee 100644
--- a/src/aura/modal/modal.cmp-meta.xml
+++ b/src/aura/modal/modal.cmp-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <AuraDefinitionBundle xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>42.0</apiVersion>
+    <apiVersion>43.0</apiVersion>
     <description>Displays a modal, using the Lightning Design System</description>
 </AuraDefinitionBundle>
diff --git a/src/aura/objectPropertyValue/objectPropertyValue.cmp-meta.xml b/src/aura/objectPropertyValue/objectPropertyValue.cmp-meta.xml
index 08cb4a9..4a2de53 100644
--- a/src/aura/objectPropertyValue/objectPropertyValue.cmp-meta.xml
+++ b/src/aura/objectPropertyValue/objectPropertyValue.cmp-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <AuraDefinitionBundle xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>42.0</apiVersion>
+    <apiVersion>43.0</apiVersion>
     <description>objectPropertyValue</description>
 </AuraDefinitionBundle>
diff --git a/src/aura/outputField/outputField.cmp b/src/aura/outputField/outputField.cmp
index 446176b..0120551 100644
--- a/src/aura/outputField/outputField.cmp
+++ b/src/aura/outputField/outputField.cmp
@@ -5,7 +5,7 @@ See LICENSE file or go to https://github.com/jongpie/LightningComponents for ful
 <aura:component extends="c.fieldMetadata">
 
     <!-- Public Attributes -->
-    <aura:attribute name="record" type="SObject" default="{}" />
+    <aura:attribute name="record" type="Sobject" default="{}" />
     <aura:attribute name="displayType" type="String" />
     <aura:attribute name="variant" type="String" default="form" description="Options: form (default) and bare" />
     <aura:attribute name="render" type="Boolean" default="true" />
@@ -23,7 +23,7 @@ See LICENSE file or go to https://github.com/jongpie/LightningComponents for ful
     <aura:handler name="change" value="{!v.fieldValue}" action="{!c.handleFieldValueChanged}" />
 
     <!-- Markup -->
-    <aura:if isTrue="{!and(v.sobjectMetadata.isAccessible, v.fieldMetadata.isAccessible, v.render)}">
+    <aura:if isTrue="{!and(v.sobjectMetadata.IsAccessible, v.fieldMetadata.IsAccessible, v.render)}">
         <div class="slds-form-element">
             <aura:if isTrue="{!v.variant == 'form'}">
                 <label class="slds-form-element__label" for="{!v.auraId}">
diff --git a/src/aura/outputField/outputField.cmp-meta.xml b/src/aura/outputField/outputField.cmp-meta.xml
index 327c369..0265777 100644
--- a/src/aura/outputField/outputField.cmp-meta.xml
+++ b/src/aura/outputField/outputField.cmp-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <AuraDefinitionBundle xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>42.0</apiVersion>
+    <apiVersion>43.0</apiVersion>
     <description>outputField</description>
 </AuraDefinitionBundle>
diff --git a/src/aura/outputField/outputFieldHelper.js b/src/aura/outputField/outputFieldHelper.js
index ceea52b..1f48e65 100644
--- a/src/aura/outputField/outputFieldHelper.js
+++ b/src/aura/outputField/outputFieldHelper.js
@@ -4,11 +4,11 @@
         var record = component.get('v.record');
 
         // Display type
-        component.set('v.displayType', fieldMetadata.displayType);
+        component.set('v.displayType', fieldMetadata.DisplayType);
 
         // Parent record name (used for REFERENCE fields)
-        var relationshipName       = fieldMetadata.relationshipName;
-        var relationshipReferences = fieldMetadata.relationshipReferences;
+        var relationshipName       = fieldMetadata.RelationshipName;
+        var relationshipReferences = fieldMetadata.RelationshipReferences;
         var relationshipNameField  = relationshipReferences && relationshipReferences.length > 0 ? relationshipReferences[0].nameField : null;
 
         if(record && record.hasOwnProperty(relationshipName)) {
@@ -36,7 +36,7 @@
         var record        = component.get('v.record');
 
         if(fieldMetadata === null) return;
-        if(fieldMetadata.displayType !== 'MULTIPICKLIST' && fieldMetadata.displayType !== 'PICKLIST') return;
+        if(fieldMetadata.DisplayType !== 'MULTIPICKLIST' && fieldMetadata.DisplayType !== 'PICKLIST') return;
         if(!record.hasOwnProperty(fieldApiName)) return;
 
         var picklistValues = record[fieldApiName].split(';');
@@ -44,8 +44,8 @@
         for(var i = 0; i < picklistValues.length; i++) {
             var picklistValue = picklistValues[i];
 
-            for(var j = 0; j < fieldMetadata.picklistOptions.length; j++) {
-                var picklistOption = fieldMetadata.picklistOptions[j];
+            for(var j = 0; j < fieldMetadata.PicklistOptions.length; j++) {
+                var picklistOption = fieldMetadata.PicklistOptions[j];
 
                 if(picklistOption.value !== picklistValue) continue;
 
diff --git a/src/aura/queueMetadata/queueMetadata.cmp-meta.xml b/src/aura/queueMetadata/queueMetadata.cmp-meta.xml
index 231417a..8fec181 100644
--- a/src/aura/queueMetadata/queueMetadata.cmp-meta.xml
+++ b/src/aura/queueMetadata/queueMetadata.cmp-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <AuraDefinitionBundle xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>42.0</apiVersion>
+    <apiVersion>43.0</apiVersion>
     <description>queueMetadata</description>
 </AuraDefinitionBundle>
diff --git a/src/aura/queueMetadata/queueMetadataHelper.js b/src/aura/queueMetadata/queueMetadataHelper.js
index f413ce9..0497ec8 100644
--- a/src/aura/queueMetadata/queueMetadataHelper.js
+++ b/src/aura/queueMetadata/queueMetadataHelper.js
@@ -1,7 +1,7 @@
 ({
     fetchQueueMetadata : function(component, event) {
-        var queueId        = component.get('v.queueId');
-        var queueApiName   = component.get('v.queueApiName');
+        var queueId      = component.get('v.queueId');
+        var queueApiName = component.get('v.queueApiName');
 
         if(!queueId && !queueApiName) return;
 
@@ -15,7 +15,7 @@
            });
        } else {
            // Otherwise, use the API name
-           action = component.get('c.getQueueMetadataByName');
+           action = component.get('c.getQueueMetadataByApiName');
            action.setParams({
                queueApiName : queueApiName
            });
diff --git a/src/aura/recordTypeMetadata/recordTypeMetadata.cmp b/src/aura/recordTypeMetadata/recordTypeMetadata.cmp
index 3c8e473..01a19b2 100644
--- a/src/aura/recordTypeMetadata/recordTypeMetadata.cmp
+++ b/src/aura/recordTypeMetadata/recordTypeMetadata.cmp
@@ -6,7 +6,7 @@ See LICENSE file or go to https://github.com/jongpie/LightningComponents for ful
 
     <!-- Public Attributes -->
     <aura:attribute name="recordTypeId" type="Id" description="The ID of the record type"  />
-    <aura:attribute name="sobjectApiName" type="String" description="The API name of the SObject"  />
+    <aura:attribute name="sobjectApiName" type="String" description="The API name of the Sobject"  />
     <aura:attribute name="recordTypeApiName" type="String" description="The API name of the record type"  />
     <aura:attribute name="recordTypeMetadata" type="RecordTypeMetadata" description="The record type metadata object returned from the controller" />
 
diff --git a/src/aura/recordTypeMetadata/recordTypeMetadata.cmp-meta.xml b/src/aura/recordTypeMetadata/recordTypeMetadata.cmp-meta.xml
index 916446f..bcdd8fd 100644
--- a/src/aura/recordTypeMetadata/recordTypeMetadata.cmp-meta.xml
+++ b/src/aura/recordTypeMetadata/recordTypeMetadata.cmp-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <AuraDefinitionBundle xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>42.0</apiVersion>
+    <apiVersion>43.0</apiVersion>
     <description>recordTypeMetadata</description>
 </AuraDefinitionBundle>
diff --git a/src/aura/simpleAdmin/simpleAdmin.cmp b/src/aura/simpleAdmin/simpleAdmin.cmp
index 5612f80..28d500b 100644
--- a/src/aura/simpleAdmin/simpleAdmin.cmp
+++ b/src/aura/simpleAdmin/simpleAdmin.cmp
@@ -8,19 +8,16 @@ See LICENSE file or go to https://github.com/jongpie/LightningComponents for ful
     <aura:attribute name="currentUser" type="User" access="private" />
     <aura:attribute name="environmentMetadata" type="EnvironmentMetadata" access="private" />
     <aura:attribute name="fieldMetadata" type="FieldMetadata" access="private" />
-    <aura:attribute name="listViewMetadata" type="ListViewMetadata" access="private" />
     <aura:attribute name="queueMetadata" type="QueueMetadata" access="private" />
     <aura:attribute name="recordTypeMetadata" type="RecordTypeMetadata" access="private" />
-    <aura:attribute name="sobjectMetadata" type="SObjectMetadata" access="private" />
+    <aura:attribute name="sobjectMetadata" type="SobjectMetadata" access="private" />
 
     <!-- Private attributes for controlling UI -->
-    <aura:attribute name="selectedSObject" type="String" access="private" />
+    <aura:attribute name="selectedSobject" type="String" access="private" />
     <aura:attribute name="selectedField" type="String" access="private" />
-    <aura:attribute name="selectedListView" type="String" access="private" />
     <aura:attribute name="selectedQueue" type="String" access="private" />
     <aura:attribute name="selectedRecordType" type="String" access="private" />
     <aura:attribute name="showFieldModal" type="String" access="private" />
-    <aura:attribute name="showListViewModal" type="String" access="private" />
     <aura:attribute name="showRecordTypeModal" type="String" access="private" />
 
     <!-- Private attributes for input field demos -->
@@ -33,11 +30,10 @@ See LICENSE file or go to https://github.com/jongpie/LightningComponents for ful
     <!-- Metadata service components -->
     <c:currentUser aura:id="currentUserService" />
     <c:environmentMetadata aura:id="environmentMetadataService" />
-    <c:fieldMetadata aura:id="fieldMetadataService" sobjectApiName="{!v.selectedSObject}" fieldApiName="{!v.selectedField}" />
-    <c:listViewMetadata aura:id="listViewMetadataService" sobjectApiName="{!v.selectedSObject}" listViewApiName="{!v.selectedListView}" />
+    <c:fieldMetadata aura:id="fieldMetadataService" sobjectApiName="{!v.selectedSobject}" fieldApiName="{!v.selectedField}" />
     <c:queueMetadata aura:id="queueMetadataService" queueApiName="{!v.selectedQueue}" />
-    <c:recordTypeMetadata aura:id="recordTypeMetadataService" sobjectApiName="{!v.selectedSObject}" recordTypeApiName="{!v.selectedRecordType}" />
-    <c:sobjectMetadata aura:id="sobjectMetadataService" sobjectApiName="{!v.selectedSObject}" />
+    <c:recordTypeMetadata aura:id="recordTypeMetadataService" sobjectApiName="{!v.selectedSobject}" recordTypeApiName="{!v.selectedRecordType}" />
+    <c:sobjectMetadata aura:id="sobjectMetadataService" sobjectApiName="{!v.selectedSobject}" />
 
     <!-- Markup -->
     <h1 class="slds-align_absolute-center" style="color:#fff;font-size:250%;font-weight:bold;margin-bottom:30px;">Simple Lightning Components</h1>
@@ -57,34 +53,34 @@ See LICENSE file or go to https://github.com/jongpie/LightningComponents for ful
                     </tr>
                 </thead>
                 <tbody>
-                    <tr><td>baseUrl</td><td>{!v.environmentMetadata.baseUrl}</td></tr>
-                    <tr><td>instanceName</td><td>{!v.environmentMetadata.instanceName}</td></tr>
-                    <tr><td>isChatterEnabled</td><td style="{!v.environmentMetadata.isChatterEnabled ? 'color:green' : 'color:red'}">{!v.environmentMetadata.isChatterEnabled}</td></tr>
-                    <tr><td>isKnowledgeEnabled</td><td style="{!v.environmentMetadata.isKnowledgeEnabled == true ? 'color:green' : 'color:red'}">{!v.environmentMetadata.isKnowledgeEnabled}</td></tr>
-                    <tr><td>isMultiCurrencyEnabled</td><td style="{!v.environmentMetadata.isMultiCurrencyEnabled == true ? 'color:green' : 'color:red'}">{!v.environmentMetadata.isMultiCurrencyEnabled}</td></tr>
-                    <tr><td>isPersonAccountEnabled</td><td style="{!v.environmentMetadata.isPersonAccountEnabled == true ? 'color:green' : 'color:red'}">{!v.environmentMetadata.isPersonAccountEnabled}</td></tr>
-                    <tr><td>isProduction</td><td style="{!v.environmentMetadata.isProduction == true ? 'color:green' : 'color:red'}">{!v.environmentMetadata.isProduction}</td></tr>
-                    <tr><td>isSandbox</td><td style="{!v.environmentMetadata.isSandbox == true ? 'color:green' : 'color:red'}">{!v.environmentMetadata.isSandbox}</td></tr>
-                    <tr><td>isTerritoryManagementEnabled</td><td style="{!v.environmentMetadata.isTerritoryManagementEnabled == true ? 'color:green' : 'color:red'}">{!v.environmentMetadata.isTerritoryManagementEnabled}</td></tr>
-                    <tr><td>namespace</td><td>{!v.environmentMetadata.namespace}</td></tr>
-                    <tr><td>organizationId</td><td>{!v.environmentMetadata.organizationId}</td></tr>
-                    <tr><td>organizationName</td><td>{!v.environmentMetadata.organizationName}</td></tr>
-                    <tr><td>organizationType</td><td>{!v.environmentMetadata.organizationType}</td></tr>
+                    <tr><td>BaseUrl</td><td>{!v.environmentMetadata.BaseUrl}</td></tr>
+                    <tr><td>InstanceName</td><td>{!v.environmentMetadata.InstanceName}</td></tr>
+                    <tr><td>IsChatterEnabled</td><td style="{!v.environmentMetadata.IsChatterEnabled ? 'color:green' : 'color:red'}">{!v.environmentMetadata.IsChatterEnabled}</td></tr>
+                    <tr><td>IsKnowledgeEnabled</td><td style="{!v.environmentMetadata.IsKnowledgeEnabled == true ? 'color:green' : 'color:red'}">{!v.environmentMetadata.IsKnowledgeEnabled}</td></tr>
+                    <tr><td>IsMultiCurrencyEnabled</td><td style="{!v.environmentMetadata.IsMultiCurrencyEnabled == true ? 'color:green' : 'color:red'}">{!v.environmentMetadata.IsMultiCurrencyEnabled}</td></tr>
+                    <tr><td>IsPersonAccountEnabled</td><td style="{!v.environmentMetadata.IsPersonAccountEnabled == true ? 'color:green' : 'color:red'}">{!v.environmentMetadata.IsPersonAccountEnabled}</td></tr>
+                    <tr><td>IsProduction</td><td style="{!v.environmentMetadata.IsProduction == true ? 'color:green' : 'color:red'}">{!v.environmentMetadata.IsProduction}</td></tr>
+                    <tr><td>IsSandbox</td><td style="{!v.environmentMetadata.IsSandbox == true ? 'color:green' : 'color:red'}">{!v.environmentMetadata.IsSandbox}</td></tr>
+                    <tr><td>IsTerritoryManagementEnabled</td><td style="{!v.environmentMetadata.IsTerritoryManagementEnabled == true ? 'color:green' : 'color:red'}">{!v.environmentMetadata.IsTerritoryManagementEnabled}</td></tr>
+                    <tr><td>Namespace</td><td>{!v.environmentMetadata.Namespace}</td></tr>
+                    <tr><td>OrganizationId</td><td>{!v.environmentMetadata.OrganizationId}</td></tr>
+                    <tr><td>OrganizationName</td><td>{!v.environmentMetadata.OrganizationName}</td></tr>
+                    <tr><td>OrganizationType</td><td>{!v.environmentMetadata.OrganizationType}</td></tr>
                     <tr>
-                        <td>queueApiNames</td>
+                        <td>QueueApiNames</td>
                         <td>
                             <ul style="border:1px solid #000; max-height:300px; overflow-y:scroll;">
-                                <aura:iteration items="{!v.environmentMetadata.queueApiNames}" var="queueApiName">
+                                <aura:iteration items="{!v.environmentMetadata.QueueApiNames}" var="queueApiName">
                                     <li>{!queueApiName}</li>
                                 </aura:iteration>
                             </ul>
                         </td>
                     </tr>
                     <tr>
-                        <td>sobjectApiNames</td>
+                        <td>SobjectApiNames</td>
                         <td>
                             <ul style="border:1px solid #000; max-height:300px; overflow-y:scroll;">
-                                <aura:iteration items="{!v.environmentMetadata.sobjectApiNames}" var="sobjectApiName">
+                                <aura:iteration items="{!v.environmentMetadata.SobjectApiNames}" var="sobjectApiName">
                                     <li>{!sobjectApiName}</li>
                                 </aura:iteration>
                             </ul>
@@ -129,11 +125,11 @@ See LICENSE file or go to https://github.com/jongpie/LightningComponents for ful
             <h2 style="font-size:150%;font-weight:bold;margin-bottom:20px;">Queue Metadata</h2>
             <div style="padding: 1.0rem; background: rgb(22, 50, 92) none repeat scroll 0% 0%;">
                 <div class="slds-text-color_inverse">
-                    <p>Choose an Queue and the metadata will be shown below</p>
+                    <p>Choose a queue and the metadata will be shown below</p>
                 </div>
                 <lightning:select label="Select a Queue" value="{!v.selectedQueue}" onchange="{!c.fetchQueueMetadata}" class="slds-text-color_inverse">
                     <option value="" text="" />
-                    <aura:iteration items="{!v.environmentMetadata.queueApiNames}" var="queueApiName">
+                    <aura:iteration items="{!v.environmentMetadata.QueueApiNames}" var="queueApiName">
                         <option value="{!queueApiName}" text="{!queueApiName}" />
                     </aura:iteration>
                 </lightning:select>
@@ -147,32 +143,28 @@ See LICENSE file or go to https://github.com/jongpie/LightningComponents for ful
                         </tr>
                     </thead>
                     <tbody>
-                        <tr><td>apiName</td><td>{!v.queueMetadata.apiName}</td></tr>
-                        <tr><td>doesIncludeBosses</td><td style="{!v.queueMetadata.doesIncludeBosses ? 'color:green' : 'color:red'}">{!v.queueMetadata.doesIncludeBosses}</td></tr>
-                        <tr><td>doesSendEmailToMembers</td><td style="{!v.queueMetadata.doesSendEmailToMembers ? 'color:green' : 'color:red'}">{!v.queueMetadata.doesSendEmailToMembers}</td></tr>
-                        <tr><td>email</td><td>{!v.queueMetadata.email}</td></tr>
-                        <tr><td>id</td><td>{!v.queueMetadata.id}</td></tr>
-                        <tr><td>label</td><td>{!v.queueMetadata.label}</td></tr>
-                        <tr><td>ownerId</td><td>{!v.queueMetadata.ownerId}</td></tr>
-                        <tr><td>ownerName</td><td>{!v.queueMetadata.ownerName}</td></tr>
-                        <tr><td>ownerType</td><td>{!v.queueMetadata.ownerType}</td></tr>
+                        <tr><td>ApiName</td><td>{!v.queueMetadata.ApiName}</td></tr>
+                        <tr><td>DoesIncludeBosses</td><td style="{!v.queueMetadata.DoesIncludeBosses ? 'color:green' : 'color:red'}">{!v.queueMetadata.DoesIncludeBosses}</td></tr>
+                        <tr><td>DoesSendEmailToMembers</td><td style="{!v.queueMetadata.DoesSendEmailToMembers ? 'color:green' : 'color:red'}">{!v.queueMetadata.DoesSendEmailToMembers}</td></tr>
+                        <tr><td>Email</td><td>{!v.queueMetadata.Email}</td></tr>
+                        <tr><td>Id</td><td>{!v.queueMetadata.Id}</td></tr>
+                        <tr><td>Label</td><td>{!v.queueMetadata.Label}</td></tr>
                         <tr>
-                            <td>supportedSObjectApiNames</td>
+                            <td>SobjectApiNames</td>
                             <td>
                                 <ul style="border:1px solid #000; max-height:300px; overflow-y:scroll;">
-                                    <aura:iteration items="{!v.queueMetadata.supportedSObjectApiNames}" var="supportedSObjectApiName">
-                                        <li>{!supportedSObjectApiName}</li>
+                                    <aura:iteration items="{!v.queueMetadata.SobjectApiNames}" var="sobjectApiName">
+                                        <li>{!sobjectApiName}</li>
                                     </aura:iteration>
                                 </ul>
                             </td>
                         </tr>
-                        <tr><td>queueMembers</td><td>{!v.queueMetadata.queueMembers}</td></tr>
                         <tr>
-                            <td>queueMembers</td>
+                            <td>QueueMembers</td>
                             <td>
                                 <ul style="border:1px solid #000; max-height:300px; overflow-y:scroll;">
-                                    <aura:iteration items="{!v.queueMetadata.queueMembers}" var="queueMember">
-                                        <li>Type: {!queueMember.type}, User Or Group Id: {!queueMember.userOrGroupId}</li>
+                                    <aura:iteration items="{!v.queueMetadata.QueueMembers}" var="queueMember">
+                                        <li>Type: {!queueMember.Type}, User Or Group Id: {!queueMember.UserOrGroupId}</li>
                                     </aura:iteration>
                                 </ul>
                             </td>
@@ -181,29 +173,28 @@ See LICENSE file or go to https://github.com/jongpie/LightningComponents for ful
                 </table>
             </aura:if>
         </lightning:tab>
-        <lightning:tab label="SObjects">
-            <h2 style="font-size:150%;font-weight:bold;margin-bottom:20px;">SObject Metadata</h2>
+        <lightning:tab label="Sobjects">
+            <h2 style="font-size:150%;font-weight:bold;margin-bottom:20px;">Sobject Metadata</h2>
             <div style="padding: 1.0rem; background: rgb(22, 50, 92) none repeat scroll 0% 0%;">
                 <div class="slds-text-color_inverse">
-                    <p>Choose an SObject and the metadata will be shown below</p>
+                    <p>Choose an Sobject and the metadata will be shown below</p>
                 </div>
             </div>
-            <lightning:select label="Select an SObject" value="{!v.selectedSObject}" onchange="{!c.fetchSObjectMetadata}">
+            <lightning:select label="Select an Sobject" value="{!v.selectedSobject}" onchange="{!c.fetchSobjectMetadata}">
                 <option value="" text="" />
-                <aura:iteration items="{!v.environmentMetadata.sobjectApiNames}" var="sobjectApiName">
+                <aura:iteration items="{!v.environmentMetadata.SobjectApiNames}" var="sobjectApiName">
                     <option value="{!sobjectApiName}" text="{!sobjectApiName}" />
                 </aura:iteration>
             </lightning:select>
-            <aura:if isTrue="{!empty(v.selectedSObject) == false}">
+            <aura:if isTrue="{!empty(v.selectedSobject) == false}">
                 <div class="slds-float--right" style="margin: 10px 30px;">
                     <lightning:button variant="brand" label="View Fields" onclick="{!c.viewFieldMetadata}" />
-                    <lightning:button variant="brand" label="View List Views" onclick="{!c.viewListViewMetadata}" />
                     <lightning:button variant="brand" label="View Record Types" onclick="{!c.viewRecordTypeMetadata}" />
                 </div>
-                <c:modal showModal="{!v.showFieldModal}" title="{!'Field Metadata for ' + v.selectedSObject}">
+                <c:modal showModal="{!v.showFieldModal}" title="{!'Field Metadata for ' + v.selectedSobject}">
                     <lightning:select label="Select a field" value="{!v.selectedField}" onchange="{!c.fetchFieldMetadata}">
                         <option value="" text="" />
-                        <aura:iteration items="{!v.sobjectMetadata.fieldApiNames}" var="fieldApiName">
+                        <aura:iteration items="{!v.sobjectMetadata.FieldApiNames}" var="fieldApiName">
                             <option value="{!fieldApiName}" text="{!fieldApiName}" />
                         </aura:iteration>
                     </lightning:select>
@@ -216,92 +207,64 @@ See LICENSE file or go to https://github.com/jongpie/LightningComponents for ful
                                 </tr>
                             </thead>
                             <tbody>
-                                <tr><td>apiName</td><td>{!v.fieldMetadata.apiName}</td></tr>
-                                <tr><td>byteLength</td><td>{!v.fieldMetadata.byteLength}</td></tr>
-                                <tr><td>defaultValue</td><td>{!v.fieldMetadata.defaultValue}</td></tr>
-                                <tr><td>digits</td><td>{!v.fieldMetadata.digits}</td></tr>
-                                <tr><td>displayType</td><td>{!v.fieldMetadata.displayType}</td></tr>
-                                <tr><td>inlineHelpText</td><td>{!v.fieldMetadata.inlineHelpText}</td></tr>
-                                <tr><td>isAccessible</td><td style="{!v.fieldMetadata.isAccessible ? 'color:green' : 'color:red'}">{!v.fieldMetadata.isAccessible}</td></tr>
-                                <tr><td>isAutoNumber</td><td style="{!v.fieldMetadata.isAutoNumber ? 'color:green' : 'color:red'}">{!v.fieldMetadata.isAutoNumber}</td></tr>
-                                <tr><td>isCalculated</td><td style="{!v.fieldMetadata.isCalculated ? 'color:green' : 'color:red'}">{!v.fieldMetadata.isCalculated}</td></tr>
-                                <tr><td>isCaseSensitive</td><td style="{!v.fieldMetadata.isCaseSensitive ? 'color:green' : 'color:red'}">{!v.fieldMetadata.isCaseSensitive}</td></tr>
-                                <tr><td>isCreateable</td><td style="{!v.fieldMetadata.isCreateable ? 'color:green' : 'color:red'}">{!v.fieldMetadata.isCreateable}</td></tr>
-                                <tr><td>isCustom</td><td style="{!v.fieldMetadata.isCustom ? 'color:green' : 'color:red'}">{!v.fieldMetadata.isCustom}</td></tr>
-                                <tr><td>isDefaultedOnCreate</td><td style="{!v.fieldMetadata.isDefaultedOnCreate ? 'color:green' : 'color:red'}">{!v.fieldMetadata.isDefaultedOnCreate}</td></tr>
-                                <tr><td>isFilterable</td><td style="{!v.fieldMetadata.isFilterable ? 'color:green' : 'color:red'}">{!v.fieldMetadata.isFilterable}</td></tr>
-                                <tr><td>isGroupable</td><td style="{!v.fieldMetadata.isGroupable ? 'color:green' : 'color:red'}">{!v.fieldMetadata.isGroupable}</td></tr>
-                                <tr><td>isNameField</td><td style="{!v.fieldMetadata.isNameField ? 'color:green' : 'color:red'}">{!v.fieldMetadata.isNameField}</td></tr>
-                                <tr><td>isNillable</td><td style="{!v.fieldMetadata.isNillable ? 'color:green' : 'color:red'}">{!v.fieldMetadata.isNillable}</td></tr>
-                                <tr><td>isRequired</td><td style="{!v.fieldMetadata.isRequired ? 'color:green' : 'color:red'}">{!v.fieldMetadata.isRequired}</td></tr>
-                                <tr><td>isSortable</td><td style="{!v.fieldMetadata.isSortable ? 'color:green' : 'color:red'}">{!v.fieldMetadata.isSortable}</td></tr>
-                                <tr><td>isUpdateable</td><td style="{!v.fieldMetadata.isUpdateable ? 'color:green' : 'color:red'}">{!v.fieldMetadata.isUpdateable}</td></tr>
-                                <tr><td>label</td><td>{!v.fieldMetadata.label}</td></tr>
-                                <tr><td>localApiName</td><td>{!v.fieldMetadata.localApiName}</td></tr>
-                                <tr><td>maxLength</td><td>{!v.fieldMetadata.maxLength}</td></tr>
-                                <tr><td>namespace</td><td>{!v.fieldMetadata.namespace}</td></tr>
+                                <tr><td>ApiName</td><td>{!v.fieldMetadata.ApiName}</td></tr>
+                                <tr><td>ByteLength</td><td>{!v.fieldMetadata.ByteLength}</td></tr>
+                                <tr><td>DefaultValue</td><td>{!v.fieldMetadata.DefaultValue}</td></tr>
+                                <tr><td>Digits</td><td>{!v.fieldMetadata.Digits}</td></tr>
+                                <tr><td>DisplayType</td><td>{!v.fieldMetadata.DisplayType}</td></tr>
+                                <tr><td>InlineHelpText</td><td>{!v.fieldMetadata.InlineHelpText}</td></tr>
+                                <tr><td>IsAccessible</td><td style="{!v.fieldMetadata.IsAccessible ? 'color:green' : 'color:red'}">{!v.fieldMetadata.IsAccessible}</td></tr>
+                                <tr><td>IsAutoNumber</td><td style="{!v.fieldMetadata.IsAutoNumber ? 'color:green' : 'color:red'}">{!v.fieldMetadata.IsAutoNumber}</td></tr>
+                                <tr><td>IsCalculated</td><td style="{!v.fieldMetadata.IsCalculated ? 'color:green' : 'color:red'}">{!v.fieldMetadata.IsCalculated}</td></tr>
+                                <tr><td>IsCaseSensitive</td><td style="{!v.fieldMetadata.IsCaseSensitive ? 'color:green' : 'color:red'}">{!v.fieldMetadata.IsCaseSensitive}</td></tr>
+                                <tr><td>IsCreateable</td><td style="{!v.fieldMetadata.IsCreateable ? 'color:green' : 'color:red'}">{!v.fieldMetadata.IsCreateable}</td></tr>
+                                <tr><td>IsCustom</td><td style="{!v.fieldMetadata.IsCustom ? 'color:green' : 'color:red'}">{!v.fieldMetadata.IsCustom}</td></tr>
+                                <tr><td>IsDefaultedOnCreate</td><td style="{!v.fieldMetadata.IsDefaultedOnCreate ? 'color:green' : 'color:red'}">{!v.fieldMetadata.IsDefaultedOnCreate}</td></tr>
+                                <tr><td>IsFilterable</td><td style="{!v.fieldMetadata.IsFilterable ? 'color:green' : 'color:red'}">{!v.fieldMetadata.IsFilterable}</td></tr>
+                                <tr><td>IsGroupable</td><td style="{!v.fieldMetadata.IsGroupable ? 'color:green' : 'color:red'}">{!v.fieldMetadata.IsGroupable}</td></tr>
+                                <tr><td>IsNameField</td><td style="{!v.fieldMetadata.IsNameField ? 'color:green' : 'color:red'}">{!v.fieldMetadata.IsNameField}</td></tr>
+                                <tr><td>IsNillable</td><td style="{!v.fieldMetadata.IsNillable ? 'color:green' : 'color:red'}">{!v.fieldMetadata.IsNillable}</td></tr>
+                                <tr><td>IsRequired</td><td style="{!v.fieldMetadata.IsRequired ? 'color:green' : 'color:red'}">{!v.fieldMetadata.IsRequired}</td></tr>
+                                <tr><td>IsSortable</td><td style="{!v.fieldMetadata.IsSortable ? 'color:green' : 'color:red'}">{!v.fieldMetadata.IsSortable}</td></tr>
+                                <tr><td>IsUpdateable</td><td style="{!v.fieldMetadata.IsUpdateable ? 'color:green' : 'color:red'}">{!v.fieldMetadata.IsUpdateable}</td></tr>
+                                <tr><td>Label</td><td>{!v.fieldMetadata.Label}</td></tr>
+                                <tr><td>LocalApiName</td><td>{!v.fieldMetadata.LocalApiName}</td></tr>
+                                <tr><td>MaxLength</td><td>{!v.fieldMetadata.MaxLength}</td></tr>
+                                <tr><td>Namespace</td><td>{!v.fieldMetadata.Namespace}</td></tr>
                                 <tr>
-                                    <td>picklistOptions</td>
+                                    <td>PicklistOptions</td>
                                     <td>
                                         <ul style="border:1px solid #000; max-height:300px; overflow-y:scroll;">
-                                            <aura:iteration items="{!v.fieldMetadata.picklistOptions}" var="picklistOption">
-                                                <li>label: {!picklistOption.label}, value: {!picklistOption.value}, isDefaultValue: {!picklistOption.value}</li>
+                                            <aura:iteration items="{!v.fieldMetadata.PicklistOptions}" var="picklistOption">
+                                                <li>Label: {!picklistOption.Label}, Value: {!picklistOption.Value}, IsDefaultValue: {!picklistOption.Value}</li>
                                             </aura:iteration>
                                         </ul>
                                     </td>
                                 </tr>
-                                <tr><td>precision</td><td>{!v.fieldMetadata.precision}</td></tr>
-                                <tr><td>relationshipName</td><td>{!v.fieldMetadata.relationshipName}</td></tr>
-                                <tr><td>relationshipOrder</td><td>{!v.fieldMetadata.relationshipOrder}</td></tr>
+                                <tr><td>Precision</td><td>{!v.fieldMetadata.Precision}</td></tr>
+                                <tr><td>RelationshipName</td><td>{!v.fieldMetadata.RelationshipApiName}</td></tr>
+                                <tr><td>RelationshipOrder</td><td>{!v.fieldMetadata.RelationshipOrder}</td></tr>
                                 <tr>
-                                    <td>relationshipReferences</td>
+                                    <td>RelationshipReferences</td>
                                     <td>
                                         <ul style="border:1px solid #000; max-height:300px; overflow-y:scroll;">
-                                            <aura:iteration items="{!v.fieldMetadata.relationshipReferences}" var="relationshipReference">
-                                                <li>label: {!relationshipReference.label}, apiName: {!relationshipReference.apiName}</li>
+                                            <aura:iteration items="{!v.fieldMetadata.RelationshipReferences}" var="relationshipReference">
+                                                <li>Label: {!relationshipReference.Label}, ApiName: {!relationshipReference.ApiName}</li>
                                             </aura:iteration>
                                         </ul>
                                     </td>
                                 </tr>
-                                <tr><td>scale</td><td>{!v.fieldMetadata.scale}</td></tr>
-                                <tr><td>soapType</td><td>{!v.fieldMetadata.soapType}</td></tr>
-                                <tr><td>sobjectApiName</td><td>{!v.fieldMetadata.sobjectApiName}</td></tr>
+                                <tr><td>Scale</td><td>{!v.fieldMetadata.Scale}</td></tr>
+                                <tr><td>SobjectApiName</td><td>{!v.fieldMetadata.SobjectApiName}</td></tr>
                             </tbody>
                         </table>
                     </aura:if>
                 </c:modal>
-                <c:modal showModal="{!v.showListViewModal}" title="{!'List View Metadata for ' + v.selectedSObject}">
-                    <lightning:select label="Select a list view" value="{!v.selectedListView}" onchange="{!c.fetchListViewMetadata}">
-                        <option value="" text="" />
-                        <aura:iteration items="{!v.sobjectMetadata.listViewApiNames}" var="listViewApiName">
-                            <option value="{!listViewApiName}" text="{!listViewApiName}" />
-                        </aura:iteration>
-                    </lightning:select>
-                    <aura:if isTrue="{!empty(v.selectedListView) == false}">
-                        <table class="slds-table slds-table_bordered slds-table_cell-buffer slds-table_striped">
-                            <thead>
-                                <tr class="slds-text-title_caps ">
-                                    <th scope="col" style="width:50%"><div class="slds-truncate">Attribute</div></th>
-                                    <th scope="col" style="width:50%"><div class="slds-truncate">Value</div></th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                <tr><td>apiName</td><td>{!v.listViewMetadata.apiName}</td></tr>
-                                <tr><td>id</td><td>{!v.listViewMetadata.id}</td></tr>
-                                <tr><td>isSoqlCompatible</td><td style="{!v.listViewMetadata.isSoqlCompatible ? 'color:green' : 'color:red'}">{!v.listViewMetadata.isSoqlCompatible}</td></tr>
-                                <tr><td>label</td><td>{!v.listViewMetadata.label}</td></tr>
-                                <tr><td>localApiName</td><td>{!v.listViewMetadata.localApiName}</td></tr>
-                                <tr><td>namespace</td><td>{!v.listViewMetadata.namespace}</td></tr>
-                                <tr><td>sobjectApiName</td><td>{!v.listViewMetadata.sobjectApiName}</td></tr>
-                            </tbody>
-                        </table>
-                    </aura:if>
-                </c:modal>
-                <c:modal showModal="{!v.showRecordTypeModal}" title="{!'Record Type Metadata for ' + v.selectedSObject}">
+                <c:modal showModal="{!v.showRecordTypeModal}" title="{!'Record Type Metadata for ' + v.selectedSobject}">
                     <lightning:select label="Select a record type" value="{!v.selectedRecordType}" onchange="{!c.fetchRecordTypeMetadata}">
                         <option value="" text="" />
-                        <aura:iteration items="{!v.sobjectMetadata.recordTypeApiNames}" var="recordTypeApiName">
-                            <option value="{!recordTypeApiName}" text="{!recordTypeApiName}" />
+                        <aura:iteration items="{!v.sobjectMetadata.RecordTypes}" var="recordType">
+                            <option value="{!recordType.ApiName}" text="{!recordType.ApiName}" />
                         </aura:iteration>
                     </lightning:select>
                     <aura:if isTrue="{!empty(v.selectedRecordType) == false}">
@@ -313,18 +276,16 @@ See LICENSE file or go to https://github.com/jongpie/LightningComponents for ful
                                 </tr>
                             </thead>
                             <tbody>
-                                <tr><td>apiName</td><td>{!v.recordTypeMetadata.apiName}</td></tr>
-                                <tr><td>businessProcessId</td><td>{!v.recordTypeMetadata.businessProcessId}</td></tr>
-                                <tr><td>description</td><td>{!v.recordTypeMetadata.description}</td></tr>
-                                <tr><td>id</td><td>{!v.recordTypeMetadata.id}</td></tr>
-                                <tr><td>isActive</td><td style="{!v.recordTypeMetadata.isActive ? 'color:green' : 'color:red'}">{!v.recordTypeMetadata.isActive}</td></tr>
-                                <tr><td>isAvailable</td><td style="{!v.recordTypeMetadata.isAvailable ? 'color:green' : 'color:red'}">{!v.recordTypeMetadata.isAvailable}</td></tr>
-                                <tr><td>isDefault</td><td style="{!v.recordTypeMetadata.isDefault ? 'color:green' : 'color:red'}">{!v.recordTypeMetadata.isDefault}</td></tr>
-                                <tr><td>isMaster</td><td style="{!v.recordTypeMetadata.isMaster ? 'color:green' : 'color:red'}">{!v.recordTypeMetadata.isMaster}</td></tr>
-                                <tr><td>label</td><td>{!v.recordTypeMetadata.label}</td></tr>
-                                <tr><td>localApiName</td><td>{!v.recordTypeMetadata.localApiName}</td></tr>
-                                <tr><td>namespace</td><td>{!v.recordTypeMetadata.namespace}</td></tr>
-                                <tr><td>sobjectApiName</td><td>{!v.recordTypeMetadata.sobjectApiName}</td></tr>
+                                <tr><td>ApiName</td><td>{!v.recordTypeMetadata.ApiName}</td></tr>
+                                <tr><td>Id</td><td>{!v.recordTypeMetadata.Id}</td></tr>
+                                <tr><td>IsActive</td><td style="{!v.recordTypeMetadata.IsActive ? 'color:green' : 'color:red'}">{!v.recordTypeMetadata.IsActive}</td></tr>
+                                <tr><td>IsAvailable</td><td style="{!v.recordTypeMetadata.IsAvailable ? 'color:green' : 'color:red'}">{!v.recordTypeMetadata.IsAvailable}</td></tr>
+                                <tr><td>IsDefault</td><td style="{!v.recordTypeMetadata.IsDefault ? 'color:green' : 'color:red'}">{!v.recordTypeMetadata.IsDefault}</td></tr>
+                                <tr><td>IsMaster</td><td style="{!v.recordTypeMetadata.IsMaster ? 'color:green' : 'color:red'}">{!v.recordTypeMetadata.IsMaster}</td></tr>
+                                <tr><td>Label</td><td>{!v.recordTypeMetadata.Label}</td></tr>
+                                <tr><td>LocalApiName</td><td>{!v.recordTypeMetadata.LocalApiName}</td></tr>
+                                <tr><td>Namespace</td><td>{!v.recordTypeMetadata.Namespace}</td></tr>
+                                <tr><td>SobjectApiName</td><td>{!v.recordTypeMetadata.SobjectApiName}</td></tr>
                             </tbody>
                         </table>
                     </aura:if>
@@ -337,27 +298,27 @@ See LICENSE file or go to https://github.com/jongpie/LightningComponents for ful
                         </tr>
                     </thead>
                     <tbody>
-                        <tr><td>apiName</td><td>{!v.sobjectMetadata.apiName}</td></tr>
-                        <tr><td>displayFieldApiName</td><td>{!v.sobjectMetadata.displayFieldApiName}</td></tr>
-                        <tr><td>hasMultiCurrency</td><td style="{!v.sobjectMetadata.hasMultiCurrency ? 'color:green' : 'color:red'}">{!v.sobjectMetadata.hasMultiCurrency}</td></tr>
-                        <tr><td>hasSubtypes</td><td style="{!v.sobjectMetadata.hasSubtypes ? 'color:green' : 'color:red'}">{!v.sobjectMetadata.hasSubtypes}</td></tr>
-                        <tr><td>isAccessible</td><td style="{!v.sobjectMetadata.isAccessible ? 'color:green' : 'color:red'}">{!v.sobjectMetadata.isAccessible}</td></tr>
-                        <tr><td>isChatterFeedEnabled</td><td style="{!v.sobjectMetadata.isChatterFeedEnabled ? 'color:green' : 'color:red'}">{!v.sobjectMetadata.isChatterFeedEnabled}</td></tr>
-                        <tr><td>isCreateable</td><td style="{!v.sobjectMetadata.isCreateable ? 'color:green' : 'color:red'}">{!v.sobjectMetadata.isCreateable}</td></tr>
-                        <tr><td>isCustom</td><td style="{!v.sobjectMetadata.isCustom ? 'color:green' : 'color:red'}">{!v.sobjectMetadata.isCustom}</td></tr>
-                        <tr><td>isCustomSetting</td><td style="{!v.sobjectMetadata.isCustomSetting ? 'color:green' : 'color:red'}">{!v.sobjectMetadata.isCustomSetting}</td></tr>
-                        <tr><td>isDeletable</td><td style="{!v.sobjectMetadata.isDeletable ? 'color:green' : 'color:red'}">{!v.sobjectMetadata.isDeletable}</td></tr>
-                        <tr><td>isMruEnabled</td><td style="{!v.sobjectMetadata.isMruEnabled ? 'color:green' : 'color:red'}">{!v.sobjectMetadata.isMruEnabled}</td></tr>
-                        <tr><td>isMergeable</td><td style="{!v.sobjectMetadata.isMergeable ? 'color:green' : 'color:red'}">{!v.sobjectMetadata.isMergeable}</td></tr>
-                        <tr><td>isQueryable</td><td style="{!v.sobjectMetadata.isQueryable ? 'color:green' : 'color:red'}">{!v.sobjectMetadata.isQueryable}</td></tr>
-                        <tr><td>isSearchable</td><td style="{!v.sobjectMetadata.isSearchable ? 'color:green' : 'color:red'}">{!v.sobjectMetadata.isSearchable}</td></tr>
-                        <tr><td>isUndeletable</td><td style="{!v.sobjectMetadata.isUndeletable ? 'color:green' : 'color:red'}">{!v.sobjectMetadata.isUndeletable}</td></tr>
-                        <tr><td>isUpdateable</td><td style="{!v.sobjectMetadata.isUpdateable ? 'color:green' : 'color:red'}">{!v.sobjectMetadata.isUpdateable}</td></tr>
+                        <tr><td>apiName</td><td>{!v.sobjectMetadata.ApiName}</td></tr>
+                        <tr><td>displayFieldApiName</td><td>{!v.sobjectMetadata.DisplayFieldApiName}</td></tr>
+                        <tr><td>hasMultiCurrency</td><td style="{!v.sobjectMetadata.HasMultiCurrency ? 'color:green' : 'color:red'}">{!v.sobjectMetadata.HasMultiCurrency}</td></tr>
+                        <tr><td>hasSubtypes</td><td style="{!v.sobjectMetadata.HasSubtypes ? 'color:green' : 'color:red'}">{!v.sobjectMetadata.HasSubtypes}</td></tr>
+                        <tr><td>isAccessible</td><td style="{!v.sobjectMetadata.IsAccessible ? 'color:green' : 'color:red'}">{!v.sobjectMetadata.IsAccessible}</td></tr>
+                        <tr><td>isChatterFeedEnabled</td><td style="{!v.sobjectMetadata.IsChatterFeedEnabled ? 'color:green' : 'color:red'}">{!v.sobjectMetadata.IsChatterFeedEnabled}</td></tr>
+                        <tr><td>isCreateable</td><td style="{!v.sobjectMetadata.IsCreateable ? 'color:green' : 'color:red'}">{!v.sobjectMetadata.IsCreateable}</td></tr>
+                        <tr><td>isCustom</td><td style="{!v.sobjectMetadata.IsCustom ? 'color:green' : 'color:red'}">{!v.sobjectMetadata.IsCustom}</td></tr>
+                        <tr><td>isCustomSetting</td><td style="{!v.sobjectMetadata.IsCustomSetting ? 'color:green' : 'color:red'}">{!v.sobjectMetadata.IsCustomSetting}</td></tr>
+                        <tr><td>isDeletable</td><td style="{!v.sobjectMetadata.IsDeletable ? 'color:green' : 'color:red'}">{!v.sobjectMetadata.IsDeletable}</td></tr>
+                        <tr><td>isMruEnabled</td><td style="{!v.sobjectMetadata.IsMruEnabled ? 'color:green' : 'color:red'}">{!v.sobjectMetadata.IsMruEnabled}</td></tr>
+                        <tr><td>isMergeable</td><td style="{!v.sobjectMetadata.IsMergeable ? 'color:green' : 'color:red'}">{!v.sobjectMetadata.IsMergeable}</td></tr>
+                        <tr><td>isQueryable</td><td style="{!v.sobjectMetadata.IsQueryable ? 'color:green' : 'color:red'}">{!v.sobjectMetadata.IsQueryable}</td></tr>
+                        <tr><td>isSearchable</td><td style="{!v.sobjectMetadata.IsSearchable ? 'color:green' : 'color:red'}">{!v.sobjectMetadata.IsSearchable}</td></tr>
+                        <tr><td>isUndeletable</td><td style="{!v.sobjectMetadata.IsUndeletable ? 'color:green' : 'color:red'}">{!v.sobjectMetadata.IsUndeletable}</td></tr>
+                        <tr><td>isUpdateable</td><td style="{!v.sobjectMetadata.IsUpdateable ? 'color:green' : 'color:red'}">{!v.sobjectMetadata.IsUpdateable}</td></tr>
                         <tr>
                             <td>fieldApiNames</td>
                             <td>
                                 <ul style="border:1px solid #000; max-height:300px; overflow-y:scroll;">
-                                    <aura:iteration items="{!v.sobjectMetadata.fieldApiNames}" var="fieldApiName">
+                                    <aura:iteration items="{!v.sobjectMetadata.FieldApiNames}" var="fieldApiName">
                                         <li>{!fieldApiName}</li>
                                     </aura:iteration>
                                 </ul>
@@ -367,38 +328,28 @@ See LICENSE file or go to https://github.com/jongpie/LightningComponents for ful
                             <td>fieldSetApiNames</td>
                             <td>
                                 <ul style="border:1px solid #000; max-height:300px; overflow-y:scroll;">
-                                    <aura:iteration items="{!v.sobjectMetadata.fieldSetApiNames}" var="fieldSetApiName">
+                                    <aura:iteration items="{!v.sobjectMetadata.FieldSetApiNames}" var="fieldSetApiName">
                                         <li>{!fieldSetApiName}</li>
                                     </aura:iteration>
                                 </ul>
                             </td>
                         </tr>
-                        <tr><td>keyPrefix</td><td>{!v.sobjectMetadata.keyPrefix}</td></tr>
-                        <tr><td>label</td><td>{!v.sobjectMetadata.label}</td></tr>
-                        <tr><td>labelPlural</td><td>{!v.sobjectMetadata.labelPlural}</td></tr>
-                        <tr>
-                            <td>listViewApiNames</td>
-                            <td>
-                                <ul style="border:1px solid #000; max-height:300px; overflow-y:scroll;">
-                                    <aura:iteration items="{!v.sobjectMetadata.listViewApiNames}" var="listViewApiName">
-                                        <li>{!listViewApiName}</li>
-                                    </aura:iteration>
-                                </ul>
-                            </td>
-                        </tr>
-                        <tr><td>localApiName</td><td>{!v.sobjectMetadata.localApiName}</td></tr>
-                        <tr><td>namespace</td><td>{!v.sobjectMetadata.namespace}</td></tr>
+                        <tr><td>keyPrefix</td><td>{!v.sobjectMetadata.KeyPrefix}</td></tr>
+                        <tr><td>label</td><td>{!v.sobjectMetadata.Label}</td></tr>
+                        <tr><td>labelPlural</td><td>{!v.sobjectMetadata.LabelPlural}</td></tr>
+                        <tr><td>localApiName</td><td>{!v.sobjectMetadata.LocalApiName}</td></tr>
+                        <tr><td>namespace</td><td>{!v.sobjectMetadata.Namespace}</td></tr>
                         <tr>
                             <td>recordTypeApiNames</td>
                             <td>
                                 <ul style="border:1px solid #000; max-height:300px; overflow-y:scroll;">
-                                    <aura:iteration items="{!v.sobjectMetadata.recordTypeApiNames}" var="recordTypeApiName">
+                                    <aura:iteration items="{!v.sobjectMetadata.RecordTypeApiNames}" var="recordTypeApiName">
                                         <li>{!recordTypeApiName}</li>
                                     </aura:iteration>
                                 </ul>
                             </td>
                         </tr>
-                        <tr><td>tabIcon</td><td>{!v.sobjectMetadata.tabIcon}</td></tr>
+                        <tr><td>tabIcon</td><td>{!v.sobjectMetadata.TabIcon}</td></tr>
                     </tbody>
                 </table>
             </aura:if>
@@ -412,7 +363,7 @@ See LICENSE file or go to https://github.com/jongpie/LightningComponents for ful
             <div class="slds-text-color_inverse">
             </div>
             <h2 style="font-size:150%;font-weight:bold;margin-bottom:20px;">
-                SObject Account Label: <c:sobjectLabel sobjectApiName="Account" />
+                Sobject Account Label: <c:sobjectLabel sobjectApiName="Account" />
                 (Plural: <c:sobjectLabel sobjectApiName="Account" variant="labelPlural" />)
             </h2>
             <div>
@@ -423,7 +374,7 @@ See LICENSE file or go to https://github.com/jongpie/LightningComponents for ful
             <br />
             <br />
             <h2 style="font-size:150%;font-weight:bold;margin-bottom:20px;">
-                SObject Task Label: <c:sobjectLabel sobjectApiName="Task" />
+                Sobject Task Label: <c:sobjectLabel sobjectApiName="Task" />
                 (Plural: <c:sobjectLabel sobjectApiName="Task" variant="labelPlural" />)
             </h2>
             <div>
diff --git a/src/aura/simpleAdmin/simpleAdmin.cmp-meta.xml b/src/aura/simpleAdmin/simpleAdmin.cmp-meta.xml
index 7a568e3..25bab56 100644
--- a/src/aura/simpleAdmin/simpleAdmin.cmp-meta.xml
+++ b/src/aura/simpleAdmin/simpleAdmin.cmp-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <AuraDefinitionBundle xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>42.0</apiVersion>
+    <apiVersion>43.0</apiVersion>
     <description>simpleAdmin</description>
 </AuraDefinitionBundle>
diff --git a/src/aura/simpleAdmin/simpleAdminController.js b/src/aura/simpleAdmin/simpleAdminController.js
index 84664c2..999eae0 100644
--- a/src/aura/simpleAdmin/simpleAdminController.js
+++ b/src/aura/simpleAdmin/simpleAdminController.js
@@ -2,7 +2,7 @@
     doInit : function(component, event, helper) {
         helper.fetchEnvironmentMetadata(component, event);
         helper.fetchCurrentUser(component, event);
-        helper.fetchSObjectMetadata(component, event);
+        helper.fetchSobjectMetadata(component, event);
     },
     fetchFieldMetadata : function(component, event, helper) {
         helper.fetchFieldMetadata(component, event);
@@ -17,19 +17,13 @@
     fetchRecordTypeMetadata : function(component, event, helper) {
         helper.fetchRecordTypeMetadata(component, event);
     },
-    viewListViewMetadata : function(component, event, helper) {
-        component.set('v.showListViewModal', true);
-    },
-    fetchListViewMetadata : function(component, event, helper) {
-        helper.fetchListViewMetadata(component, event);
-    },
     viewRecordTypeMetadata : function(component, event, helper) {
         component.set('v.showRecordTypeModal', true);
     },
-    fetchSObjectMetadata : function(component, event, helper) {
+    fetchSobjectMetadata : function(component, event, helper) {
         component.set('v.selectedField', null);
         component.set('v.selectedListView', null);
         component.set('v.selectedRecordType', null);
-        helper.fetchSObjectMetadata(component, event);
+        helper.fetchSobjectMetadata(component, event);
     }
 })
\ No newline at end of file
diff --git a/src/aura/simpleAdmin/simpleAdminHelper.js b/src/aura/simpleAdmin/simpleAdminHelper.js
index b3d8216..2d004e8 100644
--- a/src/aura/simpleAdmin/simpleAdminHelper.js
+++ b/src/aura/simpleAdmin/simpleAdminHelper.js
@@ -17,12 +17,6 @@
             component.set('v.fieldMetadata', response);
         }));
     },
-    fetchListViewMetadata : function(component, event) {
-        var listViewMetadataService = component.find('listViewMetadataService');
-        listViewMetadataService.fetch($A.getCallback(function(error, response) {
-            component.set('v.listViewMetadata', response);
-        }));
-    },
     fetchQueueMetadata : function(component, event) {
         console.log('simpl adm q');
         var queueMetadataService = component.find('queueMetadataService');
@@ -38,7 +32,7 @@
             component.set('v.recordTypeMetadata', response);
         }));
     },
-    fetchSObjectMetadata : function(component, event) {
+    fetchSobjectMetadata : function(component, event) {
         var sobjectMetadataService = component.find('sobjectMetadataService');
         sobjectMetadataService.fetch($A.getCallback(function(error, response) {
             component.set('v.sobjectMetadata', response);
diff --git a/src/aura/sobjectLabel/sobjectLabel.cmp b/src/aura/sobjectLabel/sobjectLabel.cmp
index 227a919..28bab6e 100644
--- a/src/aura/sobjectLabel/sobjectLabel.cmp
+++ b/src/aura/sobjectLabel/sobjectLabel.cmp
@@ -8,7 +8,7 @@ See LICENSE file or go to https://github.com/jongpie/LightningComponents for ful
     <aura:attribute name="variant" type="String" default="label" description="Options: label (default) and labelPlural" />
 
     <!-- Markup -->
-    <aura:if isTrue="{!v.variant == 'label'}"><ui:outputText value="{!v.sobjectMetadata.label}" /></aura:if>
-    <aura:if isTrue="{!v.variant == 'labelPlural'}"><ui:outputText value="{!v.sobjectMetadata.labelPlural}" /></aura:if>
+    <aura:if isTrue="{!v.variant == 'label'}"><ui:outputText value="{!v.sobjectMetadata.Label}" /></aura:if>
+    <aura:if isTrue="{!v.variant == 'labelPlural'}"><ui:outputText value="{!v.sobjectMetadata.LabelPlural}" /></aura:if>
 
 </aura:component>
\ No newline at end of file
diff --git a/src/aura/sobjectLabel/sobjectLabel.cmp-meta.xml b/src/aura/sobjectLabel/sobjectLabel.cmp-meta.xml
index c020327..1d722b7 100644
--- a/src/aura/sobjectLabel/sobjectLabel.cmp-meta.xml
+++ b/src/aura/sobjectLabel/sobjectLabel.cmp-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <AuraDefinitionBundle xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>42.0</apiVersion>
+    <apiVersion>43.0</apiVersion>
     <description>sobjectLabel</description>
 </AuraDefinitionBundle>
diff --git a/src/aura/sobjectMetadata/sobjectMetadata.cmp b/src/aura/sobjectMetadata/sobjectMetadata.cmp
index 989b48d..1901589 100644
--- a/src/aura/sobjectMetadata/sobjectMetadata.cmp
+++ b/src/aura/sobjectMetadata/sobjectMetadata.cmp
@@ -5,8 +5,8 @@ See LICENSE file or go to https://github.com/jongpie/LightningComponents for ful
 <aura:component extensible="true" controller="LightningMetadataController">
 
     <!-- Public Attributes -->
-    <aura:attribute name="sobjectApiName" type="String" required="true" description="The API name of the SObject" />
-    <aura:attribute name="sobjectMetadata" type="SObjectMetadata" access="public" description="The SObject metadata object returned from the controller" />
+    <aura:attribute name="sobjectApiName" type="String" required="true" description="The API name of the Sobject" />
+    <aura:attribute name="sobjectMetadata" type="SobjectMetadata" access="public" description="The Sobject metadata object returned from the controller" />
 
     <!-- Public Functions -->
     <aura:method name="fetch" action="{!c.doInit}" description="(Optional) Callback function to use after fetching the metadata">
diff --git a/src/aura/sobjectMetadata/sobjectMetadata.cmp-meta.xml b/src/aura/sobjectMetadata/sobjectMetadata.cmp-meta.xml
index 67ee0c8..6d0d118 100644
--- a/src/aura/sobjectMetadata/sobjectMetadata.cmp-meta.xml
+++ b/src/aura/sobjectMetadata/sobjectMetadata.cmp-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <AuraDefinitionBundle xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>42.0</apiVersion>
+    <apiVersion>43.0</apiVersion>
     <description>sobjectMetadata</description>
 </AuraDefinitionBundle>
diff --git a/src/aura/sobjectMetadata/sobjectMetadataController.js b/src/aura/sobjectMetadata/sobjectMetadataController.js
index 8970e36..b2eb35e 100644
--- a/src/aura/sobjectMetadata/sobjectMetadataController.js
+++ b/src/aura/sobjectMetadata/sobjectMetadataController.js
@@ -1,6 +1,6 @@
 ({
     doInit : function(component, event, helper) {
-        helper.fetchSObjectMetadata(component, event);
+        helper.fetchSobjectMetadata(component, event);
     },
     clearCachedMetadata : function(component, event, helper) {
         component.set('v.sobjectMetadata', null);
diff --git a/src/aura/sobjectMetadata/sobjectMetadataHelper.js b/src/aura/sobjectMetadata/sobjectMetadataHelper.js
index 5b31ddf..ac1011b 100644
--- a/src/aura/sobjectMetadata/sobjectMetadataHelper.js
+++ b/src/aura/sobjectMetadata/sobjectMetadataHelper.js
@@ -1,5 +1,5 @@
 ({
-    fetchSObjectMetadata : function(component, event) {
+    fetchSobjectMetadata : function(component, event) {
         var sobjectMetadata = component.get('v.sobjectMetadata');
 
         // If we already have the sobject metadata cached, use the cache
@@ -10,7 +10,7 @@
 
         if(!sobjectApiName) return;
 
-        var action = component.get('c.getSObjectMetadataByName');
+        var action = component.get('c.getSobjectMetadataByApiName');
         action.setParams({
             sobjectApiName : sobjectApiName
         });
diff --git a/src/aura/toastNotification/toastNotification.cmp-meta.xml b/src/aura/toastNotification/toastNotification.cmp-meta.xml
index d70eb57..3d0d7f9 100644
--- a/src/aura/toastNotification/toastNotification.cmp-meta.xml
+++ b/src/aura/toastNotification/toastNotification.cmp-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <AuraDefinitionBundle xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>42.0</apiVersion>
+    <apiVersion>43.0</apiVersion>
     <description>Displays a messsage and optional details in a toast notification component</description>
 </AuraDefinitionBundle>
diff --git a/src/aura/toastNotificationEvent/toastNotificationEvent.evt-meta.xml b/src/aura/toastNotificationEvent/toastNotificationEvent.evt-meta.xml
index 5364c0b..f8f6679 100644
--- a/src/aura/toastNotificationEvent/toastNotificationEvent.evt-meta.xml
+++ b/src/aura/toastNotificationEvent/toastNotificationEvent.evt-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <AuraDefinitionBundle xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>42.0</apiVersion>
+    <apiVersion>43.0</apiVersion>
     <description>An event used to trigger displaying the toastNotification component</description>
 </AuraDefinitionBundle>
diff --git a/src/classes/ContextMetadata.cls b/src/classes/ContextMetadata.cls
new file mode 100644
index 0000000..4380301
--- /dev/null
+++ b/src/classes/ContextMetadata.cls
@@ -0,0 +1,31 @@
+/*************************************************************************************************
+* This file is part of the SimpleMetadata project, released under the MIT License.               *
+* See LICENSE file or go to https://github.com/jongpie/SimpleMetadata for full license details.  *
+*************************************************************************************************/
+global class ContextMetadata {
+
+    @AuraEnabled global final Boolean IsApexRest         {get; private set;}
+    @AuraEnabled global final Boolean IsBatch            {get; private set;}
+    @AuraEnabled global final Boolean IsExecuting        {get; private set;}
+    @AuraEnabled global final Boolean IsFuture           {get; private set;}
+    @AuraEnabled global final Boolean IsLightning        {get; private set;}
+    @AuraEnabled global final Boolean IsLightningConsole {get; private set;}
+    @AuraEnabled global final Boolean IsQueueable        {get; private set;}
+    @AuraEnabled global final Boolean IsSalesforce1      {get; private set;}
+    @AuraEnabled global final Boolean IsScheduled        {get; private set;}
+    @AuraEnabled global final Boolean IsVisualforce      {get; private set;}
+
+    global ContextMetadata() {
+        this.IsApexRest         = RestContext.request != null;
+        this.IsBatch            = System.isBatch();
+        this.IsExecuting        = Trigger.isExecuting;
+        this.IsFuture           = System.isFuture();
+        this.IsLightning        = UserInfo.getUiThemeDisplayed() == 'Theme4d';
+        this.IsLightningConsole = UserInfo.getUiThemeDisplayed() == 'Theme4u';
+        this.IsQueueable        = System.isQueueable();
+        this.IsSalesforce1      = UserInfo.getUiThemeDisplayed() == 'Theme4t';
+        this.IsScheduled        = System.isScheduled();
+        this.IsVisualforce      = ApexPages.currentPage() != null;
+    }
+
+}
\ No newline at end of file
diff --git a/src/classes/ListViewMetadata.cls-meta.xml b/src/classes/ContextMetadata.cls-meta.xml
similarity index 80%
rename from src/classes/ListViewMetadata.cls-meta.xml
rename to src/classes/ContextMetadata.cls-meta.xml
index f3bac1f..800e53c 100644
--- a/src/classes/ListViewMetadata.cls-meta.xml
+++ b/src/classes/ContextMetadata.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>41.0</apiVersion>
+    <apiVersion>43.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/src/classes/ContextMetadata_Tests.cls b/src/classes/ContextMetadata_Tests.cls
new file mode 100644
index 0000000..78eb996
--- /dev/null
+++ b/src/classes/ContextMetadata_Tests.cls
@@ -0,0 +1,48 @@
+/*************************************************************************************************
+* This file is part of the SimpleMetadata project, released under the MIT License.               *
+* See LICENSE file or go to https://github.com/jongpie/SimpleMetadata for full license details.  *
+*************************************************************************************************/
+@isTest
+private class ContextMetadata_Tests {
+
+    @isTest
+    static void it_should_return_context_metadata() {
+        ContextMetadata contextMetadata = new ContextMetadata();
+        validateAttributesAreSet(contextMetadata);
+        validateCaseSentivityForJavascript(contextMetadata);
+    }
+
+    private static void validateAttributesAreSet(ContextMetadata contextMetadata) {
+        System.assertEquals(RestContext.request != null, contextMetadata.IsApexRest);
+        System.assertEquals(System.isBatch(), contextMetadata.IsBatch);
+        System.assertEquals(Trigger.isExecuting, contextMetadata.IsExecuting);
+        System.assertEquals(System.isFuture(), contextMetadata.IsFuture);
+        System.assertEquals(UserInfo.getUiThemeDisplayed() == 'Theme4d', contextMetadata.IsLightning);
+        System.assertEquals(UserInfo.getUiThemeDisplayed() == 'Theme4u', contextMetadata.IsLightningConsole);
+        System.assertEquals(System.isQueueable(), contextMetadata.IsQueueable);
+        System.assertEquals(UserInfo.getUiThemeDisplayed() == 'Theme4t', contextMetadata.IsSalesforce1);
+        System.assertEquals(System.isScheduled(), contextMetadata.IsScheduled);
+        System.assertEquals(ApexPages.currentPage() != null, contextMetadata.IsVisualforce);
+    }
+
+    private static void validateCaseSentivityForJavascript(ContextMetadata contextMetadata) {
+        // Validate that the attributes are named exactly as expected so that javascript can rely on them
+        String jsonContextMetadata = JSON.serialize(contextMetadata);
+        Map<String, Object> untypedContextMetadata = (Map<String, Object>)JSON.deserializeUntyped(jsonContextMetadata);
+
+        // One negative to confirm that the strings in our map are case sensitive
+        System.assert(untypedContextMetadata.containsKey('ISAPEXREST') == false);
+        // Now for the 'real' tests
+        System.assert(untypedContextMetadata.containsKey('IsApexRest'));
+        System.assert(untypedContextMetadata.containsKey('IsBatch'));
+        System.assert(untypedContextMetadata.containsKey('IsExecuting'));
+        System.assert(untypedContextMetadata.containsKey('IsFuture'));
+        System.assert(untypedContextMetadata.containsKey('IsLightning'));
+        System.assert(untypedContextMetadata.containsKey('IsLightningConsole'));
+        System.assert(untypedContextMetadata.containsKey('IsQueueable'));
+        System.assert(untypedContextMetadata.containsKey('IsSalesforce1'));
+        System.assert(untypedContextMetadata.containsKey('IsScheduled'));
+        System.assert(untypedContextMetadata.containsKey('IsVisualforce'));
+    }
+
+}
\ No newline at end of file
diff --git a/src/classes/SObjectMetadata_Tests.cls-meta.xml b/src/classes/ContextMetadata_Tests.cls-meta.xml
similarity index 80%
rename from src/classes/SObjectMetadata_Tests.cls-meta.xml
rename to src/classes/ContextMetadata_Tests.cls-meta.xml
index f3bac1f..800e53c 100644
--- a/src/classes/SObjectMetadata_Tests.cls-meta.xml
+++ b/src/classes/ContextMetadata_Tests.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>41.0</apiVersion>
+    <apiVersion>43.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/src/classes/EnvironmentMetadata.cls b/src/classes/EnvironmentMetadata.cls
index b368bf8..db658e1 100644
--- a/src/classes/EnvironmentMetadata.cls
+++ b/src/classes/EnvironmentMetadata.cls
@@ -2,56 +2,56 @@
 * This file is part of the SimpleMetadata project, released under the MIT License.               *
 * See LICENSE file or go to https://github.com/jongpie/SimpleMetadata for full license details.  *
 *************************************************************************************************/
-global virtual class EnvironmentMetadata {
+global class EnvironmentMetadata {
 
     // Some info must be queried from the Organization object, so cache the results to limit query count to 1
-    private static Organization organization;
+    private static final Organization ORGANIZATION;
 
     static {
-        organization = [SELECT Id, Name, InstanceName, NamespacePrefix, OrganizationType, IsSandbox FROM Organization LIMIT 1];
+        ORGANIZATION = [SELECT Id, Name, InstanceName, NamespacePrefix, OrganizationType, IsSandbox FROM Organization LIMIT 1];
     }
 
-    @AuraEnabled global final String baseUrl                       {get; private set;}
-    @AuraEnabled global final String instanceName                  {get; private set;}
-    @AuraEnabled global final Boolean isChatterEnabled             {get; private set;}
-    @AuraEnabled global final Boolean isKnowledgeEnabled           {get; private set;}
-    @AuraEnabled global final Boolean isMultiCurrencyEnabled       {get; private set;}
-    @AuraEnabled global final Boolean isPersonAccountEnabled       {get; private set;}
-    @AuraEnabled global final Boolean isProduction                 {get; private set;}
-    @AuraEnabled global final Boolean isSandbox                    {get; private set;}
-    @AuraEnabled global final Boolean isTerritoryManagementEnabled {get; private set;}
-    @AuraEnabled global final String namespace                     {get; private set;}
-    @AuraEnabled global final Id organizationId                    {get; private set;}
-    @AuraEnabled global final String organizationName              {get; private set;}
-    @AuraEnabled global final String organizationType              {get; private set;}
-    @AuraEnabled global final List<String> queueApiNames           {get; private set;}
-    @AuraEnabled global final List<String> sobjectApiNames         {get; private set;}
+    @AuraEnabled global final String BaseUrl                       {get; private set;}
+    @AuraEnabled global final String InstanceName                  {get; private set;}
+    @AuraEnabled global final Boolean IsChatterEnabled             {get; private set;}
+    @AuraEnabled global final Boolean IsKnowledgeEnabled           {get; private set;}
+    @AuraEnabled global final Boolean IsMultiCurrencyEnabled       {get; private set;}
+    @AuraEnabled global final Boolean IsPersonAccountEnabled       {get; private set;}
+    @AuraEnabled global final Boolean IsProduction                 {get; private set;}
+    @AuraEnabled global final Boolean IsSandbox                    {get; private set;}
+    @AuraEnabled global final Boolean IsTerritoryManagementEnabled {get; private set;}
+    @AuraEnabled global final String Namespace                     {get; private set;}
+    @AuraEnabled global final Id OrganizationId                    {get; private set;}
+    @AuraEnabled global final String OrganizationName              {get; private set;}
+    @AuraEnabled global final String OrganizationType              {get; private set;}
+    @AuraEnabled global final List<String> QueueApiNames           {get; private set;}
+    @AuraEnabled global final List<String> SobjectApiNames         {get; private set;}
 
     global EnvironmentMetadata() {
-        Map<String, Schema.SObjectType> sobjectTypes = Schema.getGlobalDescribe();
+        Map<String, Schema.SobjectType> sobjectTypes = Schema.getGlobalDescribe();
 
-        this.baseUrl                      = Url.getSalesforceBaseUrl().toExternalForm();
-        this.instanceName                 = organization.InstanceName;
-        this.isChatterEnabled             = sobjectTypes.containsKey('FeedItem');
-        this.isKnowledgeEnabled           = sobjectTypes.containsKey('KnowledgeArticle');
-        this.isMultiCurrencyEnabled       = UserInfo.isMultiCurrencyOrganization();
-        this.isPersonAccountEnabled       = sobjectTypes.get('Account').getDescribe().fields.getMap().containsKey('IsPersonAccount');
-        this.isProduction                 = organization.IsSandbox == false;
-        this.isSandbox                    = organization.IsSandbox;
-        this.isTerritoryManagementEnabled = sobjectTypes.containsKey('Territory');
-        this.namespace                    = organization.NamespacePrefix;
-        this.organizationId               = organization.Id;
-        this.organizationName             = organization.Name;
-        this.organizationType             = organization.OrganizationType;
-        this.queueApiNames                = QueueMetadata.getQueueApiNames();
-        this.sobjectApiNames              = this.getSObjectApiNames(sobjectTypes);
+        this.BaseUrl                      = Url.getSalesforceBaseUrl().toExternalForm();
+        this.InstanceName                 = ORGANIZATION.InstanceName;
+        this.IsChatterEnabled             = sobjectTypes.containsKey('FeedItem');
+        this.IsKnowledgeEnabled           = sobjectTypes.containsKey('KnowledgeArticle');
+        this.IsMultiCurrencyEnabled       = UserInfo.isMultiCurrencyOrganization();
+        this.IsPersonAccountEnabled       = sobjectTypes.get('Account').getDescribe().fields.getMap().containsKey('IsPersonAccount');
+        this.IsProduction                 = ORGANIZATION.IsSandbox == false;
+        this.IsSandbox                    = ORGANIZATION.IsSandbox;
+        this.IsTerritoryManagementEnabled = sobjectTypes.containsKey('Territory');
+        this.Namespace                    = ORGANIZATION.NamespacePrefix;
+        this.OrganizationId               = ORGANIZATION.Id;
+        this.OrganizationName             = ORGANIZATION.Name;
+        this.OrganizationType             = ORGANIZATION.OrganizationType;
+        this.QueueApiNames                = QueueMetadata.getQueueApiNames();
+        this.SobjectApiNames              = this.getSobjectApiNames(sobjectTypes);
     }
 
-    private List<String> getSObjectApiNames(Map<String, Schema.SObjectType> sobjectTypes) {
+    private List<String> getSobjectApiNames(Map<String, Schema.SobjectType> sobjectTypes) {
         // We could just use this.sobjectApiNames = new List<String>(sobjectTypes.keySet());
         // However, it returns the names in lowercase, which can cause problems with Javascript/Lightning since it's case-sensitive
         List<String> sobjectApiNames  = new List<String>();
-        for(Schema.SObjectType sobjectType : sobjectTypes.values()) {
+        for(Schema.SobjectType sobjectType : sobjectTypes.values()) {
             sobjectApiNames.add(String.valueOf(sobjectType));
         }
         sobjectApiNames.sort();
diff --git a/src/classes/EnvironmentMetadata.cls-meta.xml b/src/classes/EnvironmentMetadata.cls-meta.xml
index f3bac1f..800e53c 100644
--- a/src/classes/EnvironmentMetadata.cls-meta.xml
+++ b/src/classes/EnvironmentMetadata.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>41.0</apiVersion>
+    <apiVersion>43.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/src/classes/EnvironmentMetadata_Tests.cls b/src/classes/EnvironmentMetadata_Tests.cls
index cac5d24..8894a6b 100644
--- a/src/classes/EnvironmentMetadata_Tests.cls
+++ b/src/classes/EnvironmentMetadata_Tests.cls
@@ -21,33 +21,35 @@ private class EnvironmentMetadata_Tests {
         Test.startTest();
 
         System.assertEquals(0, Limits.getQueries());
-        // Only the first initialization should use a query, multiple initializations should use cached results
+        new EnvironmentMetadata();
+        Integer initialQueryCount = Limits.getQueries();
+        // Only the first initialization should use queries, multiple initializations should use cached results
         for(Integer i = 0; i < 10; i++) {
             new EnvironmentMetadata();
         }
-        System.assertEquals(1, Limits.getQueries());
+        System.assertEquals(initialQueryCount, Limits.getQueries());
 
         Test.stopTest();
     }
 
     private static void validateAttributesAreSet(EnvironmentMetadata environmentMetadata) {
         Organization organization = [SELECT Id, Name, InstanceName, NamespacePrefix, OrganizationType, IsSandbox FROM Organization LIMIT 1];
-        Map<String, Schema.SObjectType> sobjectTypes = Schema.getGlobalDescribe();
+        Map<String, Schema.SobjectType> sobjectTypes = Schema.getGlobalDescribe();
 
-        System.assertEquals(URL.getSalesforceBaseUrl().toExternalForm(), environmentMetadata.baseUrl);
-        System.assertEquals(organization.InstanceName, environmentMetadata.instanceName);
-        System.assertEquals(sobjectTypes.containsKey('FeedItem'), environmentMetadata.isChatterEnabled);
-        System.assertEquals(sobjectTypes.containsKey('KnowledgeArticle'), environmentMetadata.isKnowledgeEnabled);
-        System.assertEquals(UserInfo.isMultiCurrencyOrganization(), environmentMetadata.isMultiCurrencyEnabled);
-        System.assertEquals(sobjectTypes.get('Account').getDescribe().fields.getMap().containsKey('IsPersonAccount'), environmentMetadata.isPersonAccountEnabled);
-        System.assertEquals(organization.IsSandbox == false, environmentMetadata.isProduction);
-        System.assertEquals(organization.IsSandbox, environmentMetadata.isSandbox);
-        System.assertEquals(sobjectTypes.containsKey('Territory'), environmentMetadata.isTerritoryManagementEnabled);
-        System.assertEquals(organization.NamespacePrefix, environmentMetadata.namespace);
-        System.assertEquals(organization.Id, environmentMetadata.organizationId);
-        System.assertEquals(organization.Name, environmentMetadata.organizationName);
-        System.assertEquals(organization.OrganizationType, environmentMetadata.organizationType);
-        //System.assert(environmentMetadata.sobjectTypeNames.containsAll(sobjectTypes.keySet()));
+        System.assertEquals(URL.getSalesforceBaseUrl().toExternalForm(), environmentMetadata.BaseUrl);
+        System.assertEquals(organization.InstanceName, environmentMetadata.InstanceName);
+        System.assertEquals(sobjectTypes.containsKey('FeedItem'), environmentMetadata.IsChatterEnabled);
+        System.assertEquals(sobjectTypes.containsKey('KnowledgeArticle'), environmentMetadata.IsKnowledgeEnabled);
+        System.assertEquals(UserInfo.isMultiCurrencyOrganization(), environmentMetadata.IsMultiCurrencyEnabled);
+        System.assertEquals(sobjectTypes.get('Account').getDescribe().fields.getMap().containsKey('IsPersonAccount'), environmentMetadata.IsPersonAccountEnabled);
+        System.assertEquals(organization.IsSandbox == false, environmentMetadata.IsProduction);
+        System.assertEquals(organization.IsSandbox, environmentMetadata.IsSandbox);
+        System.assertEquals(sobjectTypes.containsKey('Territory'), environmentMetadata.IsTerritoryManagementEnabled);
+        System.assertEquals(organization.NamespacePrefix, environmentMetadata.Namespace);
+        System.assertEquals(organization.Id, environmentMetadata.OrganizationId);
+        System.assertEquals(organization.Name, environmentMetadata.OrganizationName);
+        System.assertEquals(organization.OrganizationType, environmentMetadata.OrganizationType);
+        //System.assert(environmentMetadata.SobjectTypeNames.containsAll(sobjectTypes.keySet()));
     }
 
     private static void validateCaseSentivityForJavascript(EnvironmentMetadata environmentMetadata) {
@@ -58,20 +60,20 @@ private class EnvironmentMetadata_Tests {
         // One negative to confirm that the strings in our map are case sensitive
         System.assert(untypedEnvironmentMetadata.containsKey('BASEURL') == false);
         // Now for the 'real' tests
-        System.assert(untypedEnvironmentMetadata.containsKey('baseUrl'));
-        System.assert(untypedEnvironmentMetadata.containsKey('instanceName'));
-        System.assert(untypedEnvironmentMetadata.containsKey('isChatterEnabled'));
-        System.assert(untypedEnvironmentMetadata.containsKey('isKnowledgeEnabled'));
-        System.assert(untypedEnvironmentMetadata.containsKey('isMultiCurrencyEnabled'));
-        System.assert(untypedEnvironmentMetadata.containsKey('isPersonAccountEnabled'));
-        System.assert(untypedEnvironmentMetadata.containsKey('isProduction'));
-        System.assert(untypedEnvironmentMetadata.containsKey('isSandbox'));
-        System.assert(untypedEnvironmentMetadata.containsKey('isTerritoryManagementEnabled'));
-        System.assert(untypedEnvironmentMetadata.containsKey('namespace'));
-        System.assert(untypedEnvironmentMetadata.containsKey('organizationId'));
-        System.assert(untypedEnvironmentMetadata.containsKey('organizationName'));
-        System.assert(untypedEnvironmentMetadata.containsKey('organizationType'));
-        System.assert(untypedEnvironmentMetadata.containsKey('sobjectApiNames'));
+        System.assert(untypedEnvironmentMetadata.containsKey('BaseUrl'));
+        System.assert(untypedEnvironmentMetadata.containsKey('InstanceName'));
+        System.assert(untypedEnvironmentMetadata.containsKey('IsChatterEnabled'));
+        System.assert(untypedEnvironmentMetadata.containsKey('IsKnowledgeEnabled'));
+        System.assert(untypedEnvironmentMetadata.containsKey('IsMultiCurrencyEnabled'));
+        System.assert(untypedEnvironmentMetadata.containsKey('IsPersonAccountEnabled'));
+        System.assert(untypedEnvironmentMetadata.containsKey('IsProduction'));
+        System.assert(untypedEnvironmentMetadata.containsKey('IsSandbox'));
+        System.assert(untypedEnvironmentMetadata.containsKey('IsTerritoryManagementEnabled'));
+        System.assert(untypedEnvironmentMetadata.containsKey('Namespace'));
+        System.assert(untypedEnvironmentMetadata.containsKey('OrganizationId'));
+        System.assert(untypedEnvironmentMetadata.containsKey('OrganizationName'));
+        System.assert(untypedEnvironmentMetadata.containsKey('OrganizationType'));
+        System.assert(untypedEnvironmentMetadata.containsKey('SobjectApiNames'));
     }
 
 }
\ No newline at end of file
diff --git a/src/classes/EnvironmentMetadata_Tests.cls-meta.xml b/src/classes/EnvironmentMetadata_Tests.cls-meta.xml
index f3bac1f..800e53c 100644
--- a/src/classes/EnvironmentMetadata_Tests.cls-meta.xml
+++ b/src/classes/EnvironmentMetadata_Tests.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>41.0</apiVersion>
+    <apiVersion>43.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/src/classes/FieldMetadata.cls b/src/classes/FieldMetadata.cls
index 9a6bea7..baac404 100644
--- a/src/classes/FieldMetadata.cls
+++ b/src/classes/FieldMetadata.cls
@@ -2,40 +2,40 @@
 * This file is part of the SimpleMetadata project, released under the MIT License.               *
 * See LICENSE file or go to https://github.com/jongpie/SimpleMetadata for full license details.  *
 *************************************************************************************************/
-global virtual class FieldMetadata {
+global class FieldMetadata {
 
-    @AuraEnabled global final String apiName                               {get; private set;}
-    @AuraEnabled global final Integer byteLength                           {get; private set;}
-    @AuraEnabled global final Object defaultValue                          {get; private set;}
-    @AuraEnabled global final Integer digits                               {get; private set;}
-    @AuraEnabled global final String displayType                           {get; private set;}
-    @AuraEnabled global final String inlineHelpText                        {get; private set;}
-    @AuraEnabled global final Boolean isAccessible                         {get; private set;}
-    @AuraEnabled global final Boolean isAutoNumber                         {get; private set;}
-    @AuraEnabled global final Boolean isCalculated                         {get; private set;}
-    @AuraEnabled global final Boolean isCaseSensitive                      {get; private set;}
-    @AuraEnabled global final Boolean isCreateable                         {get; private set;}
-    @AuraEnabled global final Boolean isCustom                             {get; private set;}
-    @AuraEnabled global final Boolean isDefaultedOnCreate                  {get; private set;}
-    @AuraEnabled global final Boolean isFilterable                         {get; private set;}
-    @AuraEnabled global final Boolean isGroupable                          {get; private set;}
-    @AuraEnabled global final Boolean isNameField                          {get; private set;}
-    @AuraEnabled global final Boolean isNillable                           {get; private set;}
-    @AuraEnabled global final Boolean isRequired                           {get; private set;}
-    @AuraEnabled global final Boolean isSortable                           {get; private set;}
-    @AuraEnabled global final Boolean isUpdateable                         {get; private set;}
-    @AuraEnabled global final String label                                 {get; private set;}
-    @AuraEnabled global final String localApiName                          {get; private set;}
-    @AuraEnabled global final Integer maxLength                            {get; private set;}
-    @AuraEnabled global final String namespace                             {get; private set;}
-    @AuraEnabled global final List<PicklistEntryMetadata> picklistOptions  {get; private set;}
-    @AuraEnabled global final Integer precision                            {get; private set;}
-    @AuraEnabled global final String relationshipName                      {get; private set;}
-    @AuraEnabled global final Integer relationshipOrder                    {get; private set;}
-    @AuraEnabled global final List<SObjectMetadata> relationshipReferences {get; private set;} // TODO consider changing to string[] of names instead
-    @AuraEnabled global final Integer scale                                {get; private set;}
-    @AuraEnabled global final String soapType                              {get; private set;}
-    @AuraEnabled global final String sobjectApiName                        {get; private set;}
+    @AuraEnabled global final String ApiName                               {get; private set;}
+    @AuraEnabled global final Integer ByteLength                           {get; private set;}
+    @AuraEnabled global final Object DefaultValue                          {get; private set;}
+    @AuraEnabled global final Integer Digits                               {get; private set;}
+    @AuraEnabled global final String DisplayType                           {get; private set;}
+    @AuraEnabled global final String InlineHelpText                        {get; private set;}
+    @AuraEnabled global final Boolean IsAccessible                         {get; private set;}
+    @AuraEnabled global final Boolean IsAutoNumber                         {get; private set;}
+    @AuraEnabled global final Boolean IsCalculated                         {get; private set;}
+    @AuraEnabled global final Boolean IsCaseSensitive                      {get; private set;}
+    @AuraEnabled global final Boolean IsCreateable                         {get; private set;}
+    @AuraEnabled global final Boolean IsCustom                             {get; private set;}
+    @AuraEnabled global final Boolean IsDefaultedOnCreate                  {get; private set;}
+    @AuraEnabled global final Boolean IsFilterable                         {get; private set;}
+    @AuraEnabled global final Boolean IsGroupable                          {get; private set;}
+    @AuraEnabled global final Boolean IsNameField                          {get; private set;}
+    @AuraEnabled global final Boolean IsNillable                           {get; private set;}
+    @AuraEnabled global final Boolean IsNamePointing                       {get; private set;}
+    @AuraEnabled global final Boolean IsRequired                           {get; private set;}
+    @AuraEnabled global final Boolean IsSortable                           {get; private set;}
+    @AuraEnabled global final Boolean IsUpdateable                         {get; private set;}
+    @AuraEnabled global final String Label                                 {get; private set;}
+    @AuraEnabled global final String LocalApiName                          {get; private set;}
+    @AuraEnabled global final Integer MaxLength                            {get; private set;}
+    @AuraEnabled global final String Namespace                             {get; private set;}
+    @AuraEnabled global final List<PicklistEntryMetadata> PicklistOptions  {get; private set;}
+    @AuraEnabled global final Integer Precision                            {get; private set;}
+    @AuraEnabled global final String RelationshipApiName                   {get; private set;}
+    @AuraEnabled global final Integer RelationshipOrder                    {get; private set;}
+    @AuraEnabled global final List<SobjectMetadata> RelationshipReferences {get; private set;}
+    @AuraEnabled global final Integer Scale                                {get; private set;}
+    @AuraEnabled global final String SobjectApiName                        {get; private set;}
 
     global FieldMetadata(String sobjectApiName, String fieldApiName) {
         this(
@@ -44,42 +44,42 @@ global virtual class FieldMetadata {
         );
     }
 
-    global FieldMetadata(Schema.SObjectType sobjectType, Schema.SObjectField sobjectField) {
-        Schema.DescribeSObjectResult sobjectDescribe = sobjectType.getDescribe();
+    global FieldMetadata(Schema.SobjectType sobjectType, Schema.SobjectField sobjectField) {
+        Schema.DescribeSobjectResult sobjectDescribe = sobjectType.getDescribe();
         Schema.DescribeFieldResult fieldDescribe     = sobjectField.getDescribe();
 
-        this.apiName                = String.valueOf(sobjectField);
-        this.byteLength             = fieldDescribe.getByteLength();
-        this.defaultValue           = fieldDescribe.getDefaultValue();
-        this.digits                 = fieldDescribe.getDigits();
-        this.displayType            = fieldDescribe.getType().name();
-        this.inlineHelpText         = fieldDescribe.getInlineHelpText();
-        this.isAccessible           = fieldDescribe.isAccessible();
-        this.isAutoNumber           = fieldDescribe.isAutoNumber();
-        this.isCalculated           = fieldDescribe.isCalculated();
-        this.isCaseSensitive        = fieldDescribe.isCaseSensitive();
-        this.isCreateable           = fieldDescribe.isCreateable();
-        this.isCustom               = fieldDescribe.isCustom();
-        this.isDefaultedOnCreate    = fieldDescribe.isDefaultedOnCreate();
-        this.isFilterable           = fieldDescribe.isFilterable();
-        this.isGroupable            = fieldDescribe.isGroupable();
-        this.isNameField            = fieldDescribe.isNameField();
-        this.isNillable             = fieldDescribe.isNillable();
-        this.isRequired             = fieldDescribe.isNillable() == false && fieldDescribe.isCreateable(); // If a field is NOT nillable, then it's required
-        this.isSortable             = fieldDescribe.isSortable();
-        this.isUpdateable           = fieldDescribe.isUpdateable();
-        this.label                  = fieldDescribe.getLabel();
-        this.localApiName           = fieldDescribe.getLocalName();
-        this.maxLength              = fieldDescribe.getLength();
-        this.namespace              = this.getNamespace();
-        this.picklistOptions        = this.getPicklistOptions(fieldDescribe);
-        this.precision              = fieldDescribe.getPrecision();
-        this.relationshipName       = fieldDescribe.getRelationshipName();
-        this.relationshipOrder      = fieldDescribe.getRelationshipOrder();
-        this.relationshipReferences = this.getRelationshipReferences(fieldDescribe);
-        this.scale                  = fieldDescribe.getScale();
-        this.soapType               = fieldDescribe.getSOAPType().name();
-        this.sobjectApiName         = String.valueOf(sobjectType);
+        this.ApiName                = String.valueOf(sobjectField);
+        this.ByteLength             = fieldDescribe.getByteLength();
+        this.DefaultValue           = fieldDescribe.getDefaultValue();
+        this.Digits                 = fieldDescribe.getDigits();
+        this.DisplayType            = fieldDescribe.getType().name();
+        this.InlineHelpText         = fieldDescribe.getInlineHelpText();
+        this.IsAccessible           = fieldDescribe.isAccessible();
+        this.IsAutoNumber           = fieldDescribe.isAutoNumber();
+        this.IsCalculated           = fieldDescribe.isCalculated();
+        this.IsCaseSensitive        = fieldDescribe.isCaseSensitive();
+        this.IsCreateable           = fieldDescribe.isCreateable();
+        this.IsCustom               = fieldDescribe.isCustom();
+        this.IsDefaultedOnCreate    = fieldDescribe.isDefaultedOnCreate();
+        this.IsFilterable           = fieldDescribe.isFilterable();
+        this.IsGroupable            = fieldDescribe.isGroupable();
+        this.IsNameField            = fieldDescribe.isNameField();
+        this.IsNillable             = fieldDescribe.isNillable();
+        this.IsNamePointing         = fieldDescribe.isNamePointing();
+        this.IsRequired             = fieldDescribe.isNillable() == false && fieldDescribe.isCreateable(); // If a field is NOT nillable, then it's required
+        this.IsSortable             = fieldDescribe.isSortable();
+        this.IsUpdateable           = fieldDescribe.isUpdateable();
+        this.Label                  = fieldDescribe.getLabel();
+        this.LocalApiName           = fieldDescribe.getLocalName();
+        this.MaxLength              = fieldDescribe.getLength();
+        this.Namespace              = this.getNamespace();
+        this.PicklistOptions        = this.getPicklistOptions(fieldDescribe);
+        this.Precision              = fieldDescribe.getPrecision();
+        this.RelationshipApiName    = fieldDescribe.getRelationshipName();
+        this.RelationshipOrder      = fieldDescribe.getRelationshipOrder();
+        this.RelationshipReferences = this.getRelationshipReferences(fieldDescribe);
+        this.Scale                  = fieldDescribe.getScale();
+        this.SobjectApiName         = String.valueOf(sobjectType);
     }
 
     private String getNamespace() {
@@ -99,30 +99,30 @@ global virtual class FieldMetadata {
         return picklistOptions;
     }
 
-    private List<SObjectMetadata> getRelationshipReferences(Schema.DescribeFieldResult fieldDescribe) {
-        List<SObjectMetadata> relationshipReferences = new List<SObjectMetadata>();
-        for(Schema.SObjectType sobjectType : fieldDescribe.getReferenceTo()) {
-            relationshipReferences.add(new SObjectMetadata(sobjectType));
+    private List<SobjectMetadata> getRelationshipReferences(Schema.DescribeFieldResult fieldDescribe) {
+        List<SobjectMetadata> relationshipReferences = new List<SobjectMetadata>();
+        for(Schema.SobjectType sobjectType : fieldDescribe.getReferenceTo()) {
+            relationshipReferences.add(new SobjectMetadata(sobjectType));
         }
         return relationshipReferences;
     }
 
-    global virtual class PicklistEntryMetadata {
+    global class PicklistEntryMetadata {
 
-        @AuraEnabled global final Boolean isDefaultValue {get; private set;}
-        @AuraEnabled global final String label           {get; private set;}
-        @AuraEnabled global final String value           {get; private set;}
+        @AuraEnabled global final Boolean IsDefaultValue {get; private set;}
+        @AuraEnabled global final String Label           {get; private set;}
+        @AuraEnabled global final String Value           {get; private set;}
 
         global PicklistEntryMetadata() {
-            this.isDefaultValue = false;
-            this.label          = '--None--';
-            this.value          = '';
+            this.IsDefaultValue = false;
+            this.Label          = '';
+            this.Value          = '';
         }
 
         global PicklistEntryMetadata(Schema.PicklistEntry picklistEntry) {
-            this.isDefaultValue = picklistEntry.isDefaultValue();
-            this.label          = picklistEntry.getLabel();
-            this.value          = picklistEntry.getValue();
+            this.IsDefaultValue = picklistEntry.isDefaultValue();
+            this.Label          = picklistEntry.getLabel();
+            this.Value          = picklistEntry.getValue();
         }
 
     }
diff --git a/src/classes/FieldMetadata.cls-meta.xml b/src/classes/FieldMetadata.cls-meta.xml
index f3bac1f..800e53c 100644
--- a/src/classes/FieldMetadata.cls-meta.xml
+++ b/src/classes/FieldMetadata.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>41.0</apiVersion>
+    <apiVersion>43.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/src/classes/FieldMetadata_Tests.cls b/src/classes/FieldMetadata_Tests.cls
index 990bd67..ebead4f 100644
--- a/src/classes/FieldMetadata_Tests.cls
+++ b/src/classes/FieldMetadata_Tests.cls
@@ -21,12 +21,12 @@ private class FieldMetadata_Tests {
 
     @isTest
     static void it_should_return_metadata_for_sobject_type_token_and_field_token() {
-        SObjectType accountSObjectType = Account.SObjectType;
-        SObjectField accountNameField = Account.Name;
+        SobjectType accountSobjectType = Account.SobjectType;
+        SobjectField accountNameField = Account.Name;
 
         Test.startTest();
 
-        FieldMetadata accountFieldMetadata = new FieldMetadata(accountSObjectType, accountNameField);
+        FieldMetadata accountFieldMetadata = new FieldMetadata(accountSobjectType, accountNameField);
         validateAttributesAreSet(String.valueOf(accountNameField), accountFieldMetadata);
         validateCaseSentivityForJavascript(accountFieldMetadata);
 
@@ -35,11 +35,11 @@ private class FieldMetadata_Tests {
 
     @isTest
     static void it_should_return_metadata_for_account_parentid_lookup_field_token() {
-        SObjectField parentIdField = Account.ParentId;
+        SobjectField parentIdField = Account.ParentId;
 
         Test.startTest();
 
-        FieldMetadata accountFieldMetadata = new FieldMetadata(Account.SObjectType, parentIdField);
+        FieldMetadata accountFieldMetadata = new FieldMetadata(Account.SobjectType, parentIdField);
         validateAttributesAreSet(String.valueOf(parentIdField), accountFieldMetadata);
         validateCaseSentivityForJavascript(accountFieldMetadata);
 
@@ -48,11 +48,11 @@ private class FieldMetadata_Tests {
 
     @isTest
     static void it_should_return_metadata_for_account_type_picklist_field_token() {
-        SObjectField typeField = Account.Type;
+        SobjectField typeField = Account.Type;
 
         Test.startTest();
 
-        FieldMetadata accountFieldMetadata = new FieldMetadata(Account.SObjectType, typeField);
+        FieldMetadata accountFieldMetadata = new FieldMetadata(Account.SobjectType, typeField);
         validateAttributesAreSet(String.valueOf(typeField), accountFieldMetadata);
         validateCaseSentivityForJavascript(accountFieldMetadata);
 
@@ -61,41 +61,39 @@ private class FieldMetadata_Tests {
 
     private static void validateAttributesAreSet(String fieldName, FieldMetadata fieldMetadata) {
         String sobjectName = 'Account';
-        DescribeFieldResult fieldDescribe = Schema.SObjectType.Account.fields.getMap().get(fieldName).getDescribe();
-
-        System.assertEquals(fieldDescribe.getName(), fieldMetadata.apiName);
-        System.assertEquals(fieldDescribe.getByteLength(), fieldMetadata.byteLength);
-        System.assertEquals(fieldDescribe.getDefaultValue(), fieldMetadata.defaultValue);
-        System.assertEquals(fieldDescribe.getDigits(), fieldMetadata.digits);
-        System.assertEquals(fieldDescribe.getType().name(), fieldMetadata.displayType);
-        System.assertEquals(fieldDescribe.getInlineHelpText(), fieldMetadata.inlineHelpText);
-        System.assertEquals(fieldDescribe.isAccessible(), fieldMetadata.isAccessible);
-        System.assertEquals(fieldDescribe.isAutoNumber(), fieldMetadata.isAutoNumber);
-        System.assertEquals(fieldDescribe.isCalculated(), fieldMetadata.isCalculated);
-        System.assertEquals(fieldDescribe.isCaseSensitive(), fieldMetadata.isCaseSensitive);
-        System.assertEquals(fieldDescribe.isCreateable(), fieldMetadata.isCreateable);
-        System.assertEquals(fieldDescribe.isCustom(), fieldMetadata.isCustom);
-        System.assertEquals(fieldDescribe.isDefaultedOnCreate(), fieldMetadata.isDefaultedOnCreate);
-        System.assertEquals(fieldDescribe.isFilterable(), fieldMetadata.isFilterable);
-        System.assertEquals(fieldDescribe.isGroupable(), fieldMetadata.isGroupable);
-        System.assertEquals(fieldDescribe.isNameField(), fieldMetadata.isNameField);
-        System.assertEquals(fieldDescribe.isNillable(), fieldMetadata.isNillable);
-        System.assertEquals(fieldDescribe.isNillable() == false && fieldDescribe.isCreateable(), fieldMetadata.isRequired);
-        System.assertEquals(fieldDescribe.isSortable(), fieldMetadata.isSortable);
-        System.assertEquals(fieldDescribe.isUpdateable(), fieldMetadata.isUpdateable);
-        System.assertEquals(fieldDescribe.getLabel(), fieldMetadata.label);
-        System.assertEquals(fieldDescribe.getLocalName(), fieldMetadata.localApiName);
-        System.assertEquals(fieldDescribe.getLength(), fieldMetadata.maxLength);
+        DescribeFieldResult fieldDescribe = Schema.SobjectType.Account.fields.getMap().get(fieldName).getDescribe();
+
+        System.assertEquals(fieldDescribe.getName(), fieldMetadata.ApiName);
+        System.assertEquals(fieldDescribe.getByteLength(), fieldMetadata.ByteLength);
+        System.assertEquals(fieldDescribe.getDefaultValue(), fieldMetadata.DefaultValue);
+        System.assertEquals(fieldDescribe.getDigits(), fieldMetadata.Digits);
+        System.assertEquals(fieldDescribe.getType().name(), fieldMetadata.DisplayType);
+        System.assertEquals(fieldDescribe.getInlineHelpText(), fieldMetadata.InlineHelpText);
+        System.assertEquals(fieldDescribe.isAccessible(), fieldMetadata.IsAccessible);
+        System.assertEquals(fieldDescribe.isAutoNumber(), fieldMetadata.IsAutoNumber);
+        System.assertEquals(fieldDescribe.isCalculated(), fieldMetadata.IsCalculated);
+        System.assertEquals(fieldDescribe.isCaseSensitive(), fieldMetadata.IsCaseSensitive);
+        System.assertEquals(fieldDescribe.isCreateable(), fieldMetadata.IsCreateable);
+        System.assertEquals(fieldDescribe.isCustom(), fieldMetadata.IsCustom);
+        System.assertEquals(fieldDescribe.isDefaultedOnCreate(), fieldMetadata.IsDefaultedOnCreate);
+        System.assertEquals(fieldDescribe.isFilterable(), fieldMetadata.IsFilterable);
+        System.assertEquals(fieldDescribe.isGroupable(), fieldMetadata.IsGroupable);
+        System.assertEquals(fieldDescribe.isNameField(), fieldMetadata.IsNameField);
+        System.assertEquals(fieldDescribe.isNillable(), fieldMetadata.IsNillable);
+        System.assertEquals(fieldDescribe.isNillable() == false && fieldDescribe.isCreateable(), fieldMetadata.IsRequired);
+        System.assertEquals(fieldDescribe.isSortable(), fieldMetadata.IsSortable);
+        System.assertEquals(fieldDescribe.isUpdateable(), fieldMetadata.IsUpdateable);
+        System.assertEquals(fieldDescribe.getLabel(), fieldMetadata.Label);
+        System.assertEquals(fieldDescribe.getLocalName(), fieldMetadata.LocalApiName);
+        System.assertEquals(fieldDescribe.getLength(), fieldMetadata.MaxLength);
         //System.assertEquals(this.getNamespace(), fieldMetadata.namespace);
         //System.assertEquals(this.getPicklistOptions(fieldDescribe), fieldMetadata.picklistOptions);
-        System.assertEquals(fieldDescribe.getPrecision(), fieldMetadata.precision);
-        System.assertEquals(fieldDescribe.getRelationshipName(), fieldMetadata.relationshipName);
-        System.assertEquals(fieldDescribe.getRelationshipOrder(), fieldMetadata.relationshipOrder);
-        //System.assertEquals( this.getRelationshipReferences(fieldDescribe), fieldMetadata.relationshipReferences);
-        System.assertEquals(fieldDescribe.getScale(), fieldMetadata.scale);
-        System.assertEquals(fieldDescribe.getScale(), fieldMetadata.scale);
-        System.assertEquals(fieldDescribe.getSOAPType().name(), fieldMetadata.soapType);
-        System.assertEquals(sobjectName, fieldMetadata.sobjectApiName);
+        System.assertEquals(fieldDescribe.getPrecision(), fieldMetadata.Precision);
+        System.assertEquals(fieldDescribe.getRelationshipName(), fieldMetadata.RelationshipApiName);
+        System.assertEquals(fieldDescribe.getRelationshipOrder(), fieldMetadata.RelationshipOrder);
+        //System.assertEquals( this.getRelationshipReferences(fieldDescribe), fieldMetadata.RelationshipReferences);
+        System.assertEquals(fieldDescribe.getScale(), fieldMetadata.Scale);
+        System.assertEquals(sobjectName, fieldMetadata.SobjectApiName);
     }
 
     private static void validateCaseSentivityForJavascript(FieldMetadata fieldMetadata) {
@@ -106,38 +104,37 @@ private class FieldMetadata_Tests {
         // One negative to confirm that the strings in our map are case sensitive
         System.assert(untypedFieldMetadata.containsKey('APINAME') == false);
         // Now for the 'real' tests
-        System.assert(untypedFieldMetadata.containsKey('apiName'));
-        System.assert(untypedFieldMetadata.containsKey('byteLength'));
-        System.assert(untypedFieldMetadata.containsKey('defaultValue'));
-        System.assert(untypedFieldMetadata.containsKey('digits'));
-        System.assert(untypedFieldMetadata.containsKey('displayType'));
-        System.assert(untypedFieldMetadata.containsKey('inlineHelpText'));
-        System.assert(untypedFieldMetadata.containsKey('isAccessible'));
-        System.assert(untypedFieldMetadata.containsKey('isAutoNumber'));
-        System.assert(untypedFieldMetadata.containsKey('isCalculated'));
-        System.assert(untypedFieldMetadata.containsKey('isCaseSensitive'));
-        System.assert(untypedFieldMetadata.containsKey('isCreateable'));
-        System.assert(untypedFieldMetadata.containsKey('isCustom'));
-        System.assert(untypedFieldMetadata.containsKey('isDefaultedOnCreate'));
-        System.assert(untypedFieldMetadata.containsKey('isFilterable'));
-        System.assert(untypedFieldMetadata.containsKey('isGroupable'));
-        System.assert(untypedFieldMetadata.containsKey('isNameField'));
-        System.assert(untypedFieldMetadata.containsKey('isNillable'));
-        System.assert(untypedFieldMetadata.containsKey('isRequired'));
-        System.assert(untypedFieldMetadata.containsKey('isSortable'));
-        System.assert(untypedFieldMetadata.containsKey('isUpdateable'));
-        System.assert(untypedFieldMetadata.containsKey('label'));
-        System.assert(untypedFieldMetadata.containsKey('localApiName'));
-        System.assert(untypedFieldMetadata.containsKey('maxLength'));
-        System.assert(untypedFieldMetadata.containsKey('namespace'));
-        System.assert(untypedFieldMetadata.containsKey('picklistOptions'));
-        System.assert(untypedFieldMetadata.containsKey('precision'));
-        System.assert(untypedFieldMetadata.containsKey('relationshipName'));
-        System.assert(untypedFieldMetadata.containsKey('relationshipOrder'));
-        System.assert(untypedFieldMetadata.containsKey('relationshipReferences'));
-        System.assert(untypedFieldMetadata.containsKey('scale'));
-        System.assert(untypedFieldMetadata.containsKey('soapType'));
-        System.assert(untypedFieldMetadata.containsKey('sobjectApiName'));
+        System.assert(untypedFieldMetadata.containsKey('ApiName'));
+        System.assert(untypedFieldMetadata.containsKey('ByteLength'));
+        System.assert(untypedFieldMetadata.containsKey('DefaultValue'));
+        System.assert(untypedFieldMetadata.containsKey('Digits'));
+        System.assert(untypedFieldMetadata.containsKey('DisplayType'));
+        System.assert(untypedFieldMetadata.containsKey('InlineHelpText'));
+        System.assert(untypedFieldMetadata.containsKey('IsAccessible'));
+        System.assert(untypedFieldMetadata.containsKey('IsAutoNumber'));
+        System.assert(untypedFieldMetadata.containsKey('IsCalculated'));
+        System.assert(untypedFieldMetadata.containsKey('IsCaseSensitive'));
+        System.assert(untypedFieldMetadata.containsKey('IsCreateable'));
+        System.assert(untypedFieldMetadata.containsKey('IsCustom'));
+        System.assert(untypedFieldMetadata.containsKey('IsDefaultedOnCreate'));
+        System.assert(untypedFieldMetadata.containsKey('IsFilterable'));
+        System.assert(untypedFieldMetadata.containsKey('IsGroupable'));
+        System.assert(untypedFieldMetadata.containsKey('IsNameField'));
+        System.assert(untypedFieldMetadata.containsKey('IsNillable'));
+        System.assert(untypedFieldMetadata.containsKey('IsRequired'));
+        System.assert(untypedFieldMetadata.containsKey('IsSortable'));
+        System.assert(untypedFieldMetadata.containsKey('IsUpdateable'));
+        System.assert(untypedFieldMetadata.containsKey('Label'));
+        System.assert(untypedFieldMetadata.containsKey('LocalApiName'));
+        System.assert(untypedFieldMetadata.containsKey('MaxLength'));
+        System.assert(untypedFieldMetadata.containsKey('Namespace'));
+        System.assert(untypedFieldMetadata.containsKey('PicklistOptions'));
+        System.assert(untypedFieldMetadata.containsKey('Precision'));
+        System.assert(untypedFieldMetadata.containsKey('RelationshipApiName'));
+        System.assert(untypedFieldMetadata.containsKey('RelationshipOrder'));
+        System.assert(untypedFieldMetadata.containsKey('RelationshipReferences'));
+        System.assert(untypedFieldMetadata.containsKey('Scale'));
+        System.assert(untypedFieldMetadata.containsKey('SobjectApiName'));
     }
 
 }
\ No newline at end of file
diff --git a/src/classes/FieldMetadata_Tests.cls-meta.xml b/src/classes/FieldMetadata_Tests.cls-meta.xml
index f3bac1f..800e53c 100644
--- a/src/classes/FieldMetadata_Tests.cls-meta.xml
+++ b/src/classes/FieldMetadata_Tests.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>41.0</apiVersion>
+    <apiVersion>43.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/src/classes/FieldSetMetadata.cls b/src/classes/FieldSetMetadata.cls
index c6afec4..fc666d8 100644
--- a/src/classes/FieldSetMetadata.cls
+++ b/src/classes/FieldSetMetadata.cls
@@ -2,97 +2,101 @@
 * This file is part of the SimpleMetadata project, released under the MIT License.               *
 * See LICENSE file or go to https://github.com/jongpie/SimpleMetadata for full license details.  *
 *************************************************************************************************/
-global virtual class FieldSetMetadata {
+global class FieldSetMetadata {
 
-    @AuraEnabled global final String apiName                               {get; private set;}
-    @AuraEnabled global final String description                           {get; private set;}
-    @AuraEnabled global final List<FieldSetMemberMetadata> fieldSetMembers {get; private set;}
-    @AuraEnabled global final String label                                 {get; private set;}
-    @AuraEnabled global final String localApiName                          {get; private set;}
-    @AuraEnabled global final String namespace                             {get; private set;}
-    @AuraEnabled global final String sobjectApiName                        {get; private set;}
+    @AuraEnabled global final String ApiName                               {get; private set;}
+    @AuraEnabled global final String Description                           {get; private set;}
+    @AuraEnabled global final List<FieldSetMemberMetadata> FieldSetMembers {get; private set;}
+    @AuraEnabled global final String Label                                 {get; private set;}
+    @AuraEnabled global final String LocalApiName                          {get; private set;}
+    @AuraEnabled global final String Namespace                             {get; private set;}
+    @AuraEnabled global final String SobjectApiName                        {get; private set;}
 
     global FieldSetMetadata(String sobjectApiName, String fieldSetApiName) {
         this(Schema.getGlobalDescribe().get(sobjectApiName).getDescribe().fieldSets.getMap().get(fieldSetApiName));
     }
 
     global FieldSetMetadata(Schema.FieldSet fieldSet) {
-        // SObject name & field name are used to set other values, so set them first
-        this.sobjectApiName = String.valueOf(fieldSet.getSObjectType());
-        this.apiName        = (fieldSet.getNamespace() == null ? '' : fieldSet.getNamespace() + '__') + fieldSet.getName();
-
-        this.description     = fieldSet.getDescription();
-        this.fieldSetMembers = this.getFieldSetMembers(fieldSet);
-        this.label           = fieldSet.getLabel();
-        this.localApiName    = this.getLocalApiName();
-        this.namespace       = fieldSet.getNamespace();
+        this.ApiName         = this.getApiName(fieldSet);
+        this.Description     = fieldSet.getDescription();
+        this.FieldSetMembers = this.getFieldSetMembers(fieldSet);
+        this.Label           = fieldSet.getLabel();
+        this.LocalApiName    = fieldSet.getName();
+        this.Namespace       = fieldSet.getNamespace();
+        this.SobjectApiName  = String.valueOf(fieldSet.getSobjectType());
+    }
+
+    private String getApiName(Schema.FieldSet fieldSet) {
+        String namespace = fieldSet.getNamespace() == null ? '' : fieldSet.getNamespace() + '__';
+        return namespace + fieldSet.getName();
     }
 
     private List<FieldSetMemberMetadata> getFieldSetMembers(Schema.FieldSet fieldSet) {
         List<FieldSetMemberMetadata> fieldSetMembers = new List<FieldSetMemberMetadata>();
         for(Schema.FieldSetMember fieldSetMember : fieldSet.getFields()) {
-            FieldSetMemberMetadata fieldSetMemberMetadata = new FieldSetMemberMetadata(this.sobjectApiName, fieldSetMember);
+            FieldSetMemberMetadata fieldSetMemberMetadata = new FieldSetMemberMetadata(fieldSet.getSobjectType(), fieldSetMember);
 
             fieldSetMembers.add(fieldSetMemberMetadata);
         }
+        fieldSetMembers.sort();
         return fieldSetMembers;
     }
 
-    private String getLocalApiName() {
-        Integer localNameIndex = this.apiName.replace('__c', '').indexOf('__');
-        // Add to to the localNameIndex to compensate for the '__' part of the namespace
-        return localNameIndex < 0 ? null : this.apiName.substring(localNameIndex + 2, this.apiName.length());
-    }
+    global class FieldSetMemberMetadata implements Comparable {
+
+        @AuraEnabled global final String DisplayType    {get; private set;}
+        @AuraEnabled global final FieldMetadata Field   {get; private set;}
+        @AuraEnabled global final String FieldPath      {get; private set;}
+        @AuraEnabled global final Boolean IsDbRequired  {get; private set;}
+        @AuraEnabled global final Boolean IsRequired    {get; private set;}
+        @AuraEnabled global final String Label          {get; private set;}
+        @AuraEnabled global final String SobjectApiName {get; private set;}
 
-    global virtual class FieldSetMemberMetadata {
-
-        @AuraEnabled global final String displayType    {get; private set;}
-        @AuraEnabled global final FieldMetadata field   {get; private set;}
-        @AuraEnabled global final String fieldPath      {get; private set;}
-        @AuraEnabled global final Boolean isDbRequired  {get; private set;}
-        @AuraEnabled global final Boolean isRequired    {get; private set;}
-        @AuraEnabled global final String label          {get; private set;}
-        @AuraEnabled global final String sobjectApiName {get; private set;}
-
-        private FieldSetMemberMetadata(String sobjectApiName, Schema.FieldSetMember fieldSetMember) {
-            this.sobjectApiName = sobjectApiName;
-
-            this.displayType  = fieldSetMember.getType().name();
-            this.field        = this.getFieldMetadata(fieldSetMember);
-            this.fieldPath    = fieldSetMember.getFieldPath();
-            this.isDbRequired = fieldSetMember.getDbRequired();
-            this.isRequired   = fieldSetMember.getRequired();
-            this.label        = fieldSetMember.getLabel();
+        global Integer compareTo(Object compareTo) {
+            FieldSetMemberMetadata compareToFieldSetMember = (FieldSetMemberMetadata)compareTo;
+
+            if(this.FieldPath == compareToFieldSetMember.FieldPath) return 0;
+            else if(this.FieldPath > compareToFieldSetMember.FieldPath) return 1;
+            else return -1;
+        }
+
+        private FieldSetMemberMetadata(Schema.SobjectType sobjectType, Schema.FieldSetMember fieldSetMember) {
+            this.DisplayType    = fieldSetMember.getType().name();
+            this.Field          = this.getFieldMetadata(sobjectType, fieldSetMember);
+            this.FieldPath      = fieldSetMember.getFieldPath();
+            this.IsDbRequired   = fieldSetMember.getDbRequired();
+            this.IsRequired     = fieldSetMember.getRequired();
+            this.Label          = fieldSetMember.getLabel();
+            this.SobjectApiName = String.valueOf(sobjectType);
         }
 
-        private FieldMetadata getFieldMetadata(Schema.FieldSetMember fieldSetMember) {
+        private FieldMetadata getFieldMetadata(Schema.SobjectType sobjectType, Schema.FieldSetMember fieldSetMember) {
             FieldMetadata fieldMetadata;
 
             List<String> fieldChain = fieldSetMember.getFieldPath().split('\\.');
 
             if(fieldChain.size() == 0) return fieldMetadata;
 
-            Schema.SObjectType currentFieldSObjectType = Schema.getGlobalDescribe().get(this.sobjectApiName);
-            String currentFieldSObjectApiName = this.sobjectApiName;
+            Schema.SobjectType currentFieldSobjectType = Schema.getGlobalDescribe().get(this.sobjectApiName);
+            String currentFieldSobjectApiName = String.valueOf(sobjectType);
             String currentFieldApiName;
 
             for(Integer i = 0; i < fieldChain.size(); i++) {
                 currentFieldApiName = fieldChain[i];
 
-                for(Schema.SObjectField sobjectField : Schema.getGlobalDescribe().get(currentFieldSObjectApiName).getDescribe().fields.getMap().values()) {
+                for(Schema.SobjectField sobjectField : Schema.getGlobalDescribe().get(currentFieldSobjectApiName).getDescribe().fields.getMap().values()) {
                     DescribeFieldResult fieldDescribe = sobjectField.getDescribe();
 
-                    if(fieldDescribe.getRelationshipName() == currentFieldApiName && !fieldDescribe.getReferenceTo().isEmpty()) {
-                        currentFieldSObjectType = fieldDescribe.getReferenceTo()[0];
-                        currentFieldSObjectApiName = currentFieldSObjectType.getDescribe().getName();
-
-                        break;
-                    }
+                    if(fieldDescribe.getRelationshipName() != currentFieldApiName) continue;
+                    if(fieldDescribe.getReferenceTo().isEmpty()) continue;
 
+                    currentFieldSobjectType = fieldDescribe.getReferenceTo()[0];
+                    currentFieldSobjectApiName = currentFieldSobjectType.getDescribe().getName();
+                    break;
                 }
             }
 
-            return new FieldMetadata(currentFieldSObjectApiName, currentFieldApiName);
+            return new FieldMetadata(currentFieldSobjectApiName, currentFieldApiName);
         }
 
     }
diff --git a/src/classes/FieldSetMetadata.cls-meta.xml b/src/classes/FieldSetMetadata.cls-meta.xml
index f3bac1f..800e53c 100644
--- a/src/classes/FieldSetMetadata.cls-meta.xml
+++ b/src/classes/FieldSetMetadata.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>41.0</apiVersion>
+    <apiVersion>43.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/src/classes/FieldSetMetadata_Tests.cls b/src/classes/FieldSetMetadata_Tests.cls
index a681f4a..d7f44b0 100644
--- a/src/classes/FieldSetMetadata_Tests.cls
+++ b/src/classes/FieldSetMetadata_Tests.cls
@@ -12,7 +12,7 @@ private class FieldSetMetadata_Tests {
 
         Test.startTest();
 
-        String sobjectName = String.valueOf(fieldSet.getSObjectType());
+        String sobjectName = String.valueOf(fieldSet.getSobjectType());
         String fieldSetNamespace = fieldSet.getNamespace() == null ? '' : fieldSet.getNamespace() + '__';
         String fieldSetName = fieldSetNamespace + fieldSet.getName();
         FieldSetMetadata fieldSetMetadata = new FieldSetMetadata(sobjectName, fieldSetName);
@@ -39,11 +39,11 @@ private class FieldSetMetadata_Tests {
     private static Schema.FieldSet getFieldSet() {
         // Dynamically check for field sets in some of the most commonly used objects
         // If not results are found, then test coverage will drop
-        List<String> commonSObjectNames = new List<String>{
+        List<String> commonSobjectNames = new List<String>{
             'Account', 'Lead', 'Contact', 'Opportunity'
         };
-        for(String sobjectName : commonSObjectNames) {
-            Schema.DescribeSObjectResult sobjectDescribe = Schema.getGlobalDescribe().get(sobjectName).getDescribe();
+        for(String sobjectName : commonSobjectNames) {
+            Schema.DescribeSobjectResult sobjectDescribe = Schema.getGlobalDescribe().get(sobjectName).getDescribe();
             // If there are any fields sets found, return the first one
             if(sobjectDescribe.fieldSets.getMap().isEmpty() == false) return sobjectDescribe.fieldSets.getMap().values()[0];
         }
@@ -55,14 +55,14 @@ private class FieldSetMetadata_Tests {
         if(fieldSet.getNamespace() != null) namespacePrefix = fieldSet.getNamespace() + '__';
         String fieldSetName = namespacePrefix + fieldSet.getName();
 
-        System.assertEquals(fieldSetName, fieldSetMetadata.apiName);
-        System.assertEquals(fieldSet.getDescription(), fieldSetMetadata.description);
-        System.assertEquals(fieldSet.getFields().size(), fieldSetMetadata.fieldSetMembers.size());
+        System.assertEquals(fieldSetName, fieldSetMetadata.ApiName);
+        System.assertEquals(fieldSet.getDescription(), fieldSetMetadata.Description);
+        System.assertEquals(fieldSet.getFields().size(), fieldSetMetadata.FieldSetMembers.size());
         // TODO add asserts for field set members' field metadata
-        System.assertEquals(fieldSet.getLabel(), fieldSetMetadata.label);
+        System.assertEquals(fieldSet.getLabel(), fieldSetMetadata.Label);
         // TODO add assert for localName
-        System.assertEquals(fieldSet.getNamespace(), fieldSetMetadata.namespace);
-        System.assertEquals(String.valueOf(fieldSet.getSObjectType()), fieldSetMetadata.sobjectApiName);
+        System.assertEquals(fieldSet.getNamespace(), fieldSetMetadata.Namespace);
+        System.assertEquals(String.valueOf(fieldSet.getSobjectType()), fieldSetMetadata.SobjectApiName);
     }
 
     private static void validateCaseSentivityForJavascript(FieldSetMetadata fieldSetMetadata) {
@@ -73,13 +73,13 @@ private class FieldSetMetadata_Tests {
         // One negative to confirm that the strings in our map are case sensitive
         System.assert(untypedFieldSetMetadata.containsKey('APINAME') == false);
         // Now for the 'real' tests
-        System.assert(untypedFieldSetMetadata.containsKey('apiName'));
-        System.assert(untypedFieldSetMetadata.containsKey('description'));
-        System.assert(untypedFieldSetMetadata.containsKey('fieldSetMembers'));
-        System.assert(untypedFieldSetMetadata.containsKey('label'));
-        System.assert(untypedFieldSetMetadata.containsKey('localApiName'));
-        System.assert(untypedFieldSetMetadata.containsKey('namespace'));
-        System.assert(untypedFieldSetMetadata.containsKey('sobjectApiName'));
+        System.assert(untypedFieldSetMetadata.containsKey('ApiName'));
+        System.assert(untypedFieldSetMetadata.containsKey('Description'));
+        System.assert(untypedFieldSetMetadata.containsKey('FieldSetMembers'));
+        System.assert(untypedFieldSetMetadata.containsKey('Label'));
+        System.assert(untypedFieldSetMetadata.containsKey('LocalApiName'));
+        System.assert(untypedFieldSetMetadata.containsKey('Namespace'));
+        System.assert(untypedFieldSetMetadata.containsKey('SobjectApiName'));
         // TODO add asserts for FieldSetMembers
     }
 
diff --git a/src/classes/FieldSetMetadata_Tests.cls-meta.xml b/src/classes/FieldSetMetadata_Tests.cls-meta.xml
index f3bac1f..800e53c 100644
--- a/src/classes/FieldSetMetadata_Tests.cls-meta.xml
+++ b/src/classes/FieldSetMetadata_Tests.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>41.0</apiVersion>
+    <apiVersion>43.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/src/classes/LightningMetadataController.cls b/src/classes/LightningMetadataController.cls
index b7e2322..9f5332a 100644
--- a/src/classes/LightningMetadataController.cls
+++ b/src/classes/LightningMetadataController.cls
@@ -17,10 +17,10 @@ public with sharing class LightningMetadataController {
             // TODO improve this so it handles field paths for parent objects, like 'Manager.Profile.Name'
             if(additionalFieldApiNames != null) userFieldNames.addAll(additionalFieldApiNames);
 
-            DescribeSObjectResult userDescribe = Schema.User.SObjectType.getDescribe();
+            DescribeSobjectResult userDescribe = Schema.User.SobjectType.getDescribe();
             List<String> userFieldNamesToQuery = new List<String>();
             for(String fieldApiName : userFieldNames) {
-                SObjectField field = userDescribe.fields.getMap().get(fieldApiName);
+                SobjectField field = userDescribe.fields.getMap().get(fieldApiName);
 
                 if(field == null) continue;
 
@@ -52,7 +52,7 @@ public with sharing class LightningMetadataController {
     }
 
     @AuraEnabled
-    public static FieldMetadata getFieldMetadataByName(String sobjectApiName, String fieldApiName) {
+    public static FieldMetadata getFieldMetadataByApiName(String sobjectApiName, String fieldApiName) {
         System.debug(LoggingLevel.INFO, 'Executing LightningMetadataController.getFieldMetadata(\'' + sobjectApiName + '\', \'' + fieldApiName + '\')');
         try {
             return new FieldMetadata(sobjectApiName, fieldApiName);
@@ -62,8 +62,8 @@ public with sharing class LightningMetadataController {
     }
 
     @AuraEnabled
-    public static FieldSetMetadata getFieldSetMetadataByName(String sobjectApiName, String fieldSetApiName) {
-        System.debug(LoggingLevel.INFO, 'Executing LightningMetadataController.getFieldSetMetadataByName(\'' + sobjectApiName + '\', \'' + fieldSetApiName + '\')');
+    public static FieldSetMetadata getFieldSetMetadataByApiName(String sobjectApiName, String fieldSetApiName) {
+        System.debug(LoggingLevel.INFO, 'Executing LightningMetadataController.getFieldSetMetadataByApiName(\'' + sobjectApiName + '\', \'' + fieldSetApiName + '\')');
         try {
             return new FieldSetMetadata(sobjectApiName, fieldSetApiName);
         } catch(Exception ex) {
@@ -71,16 +71,6 @@ public with sharing class LightningMetadataController {
         }
     }
 
-    @AuraEnabled
-    public static ListViewMetadata getListViewMetadataByName(String sobjectApiName, String listViewApiName) {
-        System.debug(LoggingLevel.INFO, 'Executing LightningMetadataController.getListViewMetadata(\'' + sobjectApiName + '\', \'' + listViewApiName + '\')');
-        try {
-            return new ListViewMetadata(sobjectApiName, listViewApiName);
-        } catch(Exception ex) {
-            throw new AuraHandledException(ex.getMessage());
-        }
-    }
-
     @AuraEnabled
     public static QueueMetadata getQueueMetadataById(Id queueId) {
         System.debug(LoggingLevel.INFO, 'Executing LightningMetadataController.getQueueMetadataById(\'' + queueId + '\')');
@@ -92,8 +82,8 @@ public with sharing class LightningMetadataController {
     }
 
     @AuraEnabled
-    public static QueueMetadata getQueueMetadataByName(String queueApiName) {
-        System.debug(LoggingLevel.INFO, 'Executing LightningMetadataController.getQueueMetadataByName(\'' + queueApiName + '\')');
+    public static QueueMetadata getQueueMetadataByApiName(String queueApiName) {
+        System.debug(LoggingLevel.INFO, 'Executing LightningMetadataController.getQueueMetadataByApiName(\'' + queueApiName + '\')');
         try {
             return new QueueMetadata(queueApiName);
         } catch(Exception ex) {
@@ -102,10 +92,10 @@ public with sharing class LightningMetadataController {
     }
 
     @AuraEnabled
-    public static RecordTypeMetadata getRecordTypeMetadataById(Id recordTypeId) {
+    public static RecordTypeMetadata getRecordTypeMetadataById(String sobjectApiName, Id recordTypeId) {
         System.debug(LoggingLevel.INFO, 'Executing LightningMetadataController.getRecordTypeMetadataById(\'' + recordTypeId + '\')');
         try {
-            return new RecordTypeMetadata(recordTypeId);
+            return new RecordTypeMetadata(Schema.getGlobalDescribe().get(sobjectApiName), recordTypeId);
         } catch(Exception ex) {
             throw new AuraHandledException(ex.getMessage());
         }
@@ -122,10 +112,10 @@ public with sharing class LightningMetadataController {
     }
 
     @AuraEnabled
-    public static SObjectMetadata getSObjectMetadataByName(String sobjectApiName) {
-        System.debug(LoggingLevel.INFO, 'Executing LightningMetadataController.getSObjectMetadata(\'' + sobjectApiName + '\')');
+    public static SobjectMetadata getSobjectMetadataByApiName(String sobjectApiName) {
+        System.debug(LoggingLevel.INFO, 'Executing LightningMetadataController.getSobjectMetadataByApiName(\'' + sobjectApiName + '\')');
         try {
-            return new SObjectMetadata(sobjectApiName);
+            return new SobjectMetadata(sobjectApiName);
         } catch(Exception ex) {
             throw new AuraHandledException(ex.getMessage());
         }
diff --git a/src/classes/LightningMetadataController.cls-meta.xml b/src/classes/LightningMetadataController.cls-meta.xml
index f3bac1f..800e53c 100644
--- a/src/classes/LightningMetadataController.cls-meta.xml
+++ b/src/classes/LightningMetadataController.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>41.0</apiVersion>
+    <apiVersion>43.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/src/classes/LightningMetadataController_Tests.cls b/src/classes/LightningMetadataController_Tests.cls
index a2a0553..92cca46 100644
--- a/src/classes/LightningMetadataController_Tests.cls
+++ b/src/classes/LightningMetadataController_Tests.cls
@@ -11,7 +11,7 @@ private class LightningMetadataController_Tests {
         DescribeSObjectResult sobjectDescribe = Schema.Account.SObjectType.getDescribe();
 
         Test.startTest();
-        SObjectMetadata sobjectMetadata = LightningMetadataController.getSObjectMetadataByName(sobjectName);
+        SObjectMetadata sobjectMetadata = LightningMetadataController.getSObjectMetadataByApiName(sobjectName);
         Test.stopTest();
 
         System.assertEquals(sobjectName, sobjectMetadata.apiName);
@@ -25,7 +25,7 @@ private class LightningMetadataController_Tests {
 
         Test.startTest();
         try {
-            SObjectMetadata sobjectMetadata = LightningMetadataController.getSObjectMetadataByName(sobjectName);
+            SObjectMetadata sobjectMetadata = LightningMetadataController.getSObjectMetadataByApiName(sobjectName);
             System.assert(false, 'Exception expected here');
         } catch(Exception ex) {
             System.assert(ex instanceOf AuraHandledException);
@@ -41,7 +41,7 @@ private class LightningMetadataController_Tests {
         DescribeFieldResult fieldDescribe = Schema.Account.SObjectType.fields.Type.getDescribe();
 
         Test.startTest();
-        FieldMetadata fieldMetadata = LightningMetadataController.getFieldMetadataByName(sobjectName, fieldName);
+        FieldMetadata fieldMetadata = LightningMetadataController.getFieldMetadataByApiName(sobjectName, fieldName);
         Test.stopTest();
 
         System.assertEquals(sobjectName, fieldMetadata.sobjectApiName);
@@ -56,7 +56,7 @@ private class LightningMetadataController_Tests {
 
         Test.startTest();
         try {
-            FieldMetadata fieldMetadata = LightningMetadataController.getFieldMetadataByName(sobjectName, fieldName);
+            FieldMetadata fieldMetadata = LightningMetadataController.getFieldMetadataByApiName(sobjectName, fieldName);
             System.assert(false, 'Exception expected here');
         } catch(Exception ex) {
             System.assert(ex instanceOf AuraHandledException);
diff --git a/src/classes/LightningMetadataController_Tests.cls-meta.xml b/src/classes/LightningMetadataController_Tests.cls-meta.xml
index f3bac1f..800e53c 100644
--- a/src/classes/LightningMetadataController_Tests.cls-meta.xml
+++ b/src/classes/LightningMetadataController_Tests.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>41.0</apiVersion>
+    <apiVersion>43.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/src/classes/LimitsMetadata.cls b/src/classes/LimitsMetadata.cls
new file mode 100644
index 0000000..6e9c4bf
--- /dev/null
+++ b/src/classes/LimitsMetadata.cls
@@ -0,0 +1,53 @@
+/*************************************************************************************************
+* This file is part of the SimpleMetadata project, released under the MIT License.               *
+* See LICENSE file or go to https://github.com/jongpie/SimpleMetadata for full license details.  *
+*************************************************************************************************/
+global class LimitsMetadata {
+
+    @AuraEnabled global final LimitUsageMetadata AggregateQueries     {get; private set;}
+    @AuraEnabled global final LimitUsageMetadata AsyncCalls           {get; private set;}
+    @AuraEnabled global final LimitUsageMetadata Callouts             {get; private set;}
+    @AuraEnabled global final LimitUsageMetadata CpuTime              {get; private set;}
+    @AuraEnabled global final LimitUsageMetadata DmlRows              {get; private set;}
+    @AuraEnabled global final LimitUsageMetadata DmlStatements        {get; private set;}
+    @AuraEnabled global final LimitUsageMetadata EmailInvocations     {get; private set;}
+    @AuraEnabled global final LimitUsageMetadata FutureCalls          {get; private set;}
+    @AuraEnabled global final LimitUsageMetadata HeapSize             {get; private set;}
+    @AuraEnabled global final LimitUsageMetadata MobilePushApexCalls  {get; private set;}
+    @AuraEnabled global final LimitUsageMetadata QueueableJobs        {get; private set;}
+    @AuraEnabled global final LimitUsageMetadata SoqlQueryLocatorRows {get; private set;}
+    @AuraEnabled global final LimitUsageMetadata SoqlQueryRows        {get; private set;}
+    @AuraEnabled global final LimitUsageMetadata SoqlQueries          {get; private set;}
+    @AuraEnabled global final LimitUsageMetadata SoslSearches         {get; private set;}
+
+    global LimitsMetadata() {
+        this.AggregateQueries     = new LimitUsageMetadata(Limits.getAggregateQueries(), Limits.getLimitAggregateQueries());
+        this.AsyncCalls           = new LimitUsageMetadata(Limits.getAsyncCalls(), Limits.getLimitAsyncCalls());
+        this.Callouts             = new LimitUsageMetadata(Limits.getCallouts(), Limits.getLimitCallouts());
+        this.CpuTime              = new LimitUsageMetadata(Limits.getCPUTime(), Limits.getLimitCPUTime());
+        this.DmlRows              = new LimitUsageMetadata(Limits.getDmlRows(), Limits.getLimitDmlRows());
+        this.DmlStatements        = new LimitUsageMetadata(Limits.getDmlStatements(), Limits.getLimitDmlStatements());
+        this.EmailInvocations     = new LimitUsageMetadata(Limits.getEmailInvocations(), Limits.getLimitEmailInvocations());
+        this.FutureCalls          = new LimitUsageMetadata(Limits.getFutureCalls(), Limits.getLimitFutureCalls());
+        this.HeapSize             = new LimitUsageMetadata(Limits.getHeapSize(), Limits.getLimitHeapSize());
+        this.MobilePushApexCalls  = new LimitUsageMetadata(Limits.getMobilePushApexCalls(), Limits.getLimitMobilePushApexCalls());
+        this.QueueableJobs        = new LimitUsageMetadata(Limits.getQueueableJobs(), Limits.getLimitQueueableJobs());
+        this.SoqlQueries          = new LimitUsageMetadata(Limits.getQueries(), Limits.getLimitQueries());
+        this.SoqlQueryLocatorRows = new LimitUsageMetadata(Limits.getQueryLocatorRows(), Limits.getLimitQueryLocatorRows());
+        this.SoqlQueryRows        = new LimitUsageMetadata(Limits.getQueryRows(), Limits.getLimitQueryRows());
+        this.SoslSearches         = new LimitUsageMetadata(Limits.getSoslQueries(), Limits.getLimitSoslQueries());
+    }
+
+    global class LimitUsageMetadata {
+
+        @AuraEnabled global final Integer Max {get; private set;}
+        @AuraEnabled global final Integer Used {get; private set;}
+
+        global LimitUsageMetadata(Integer used, Integer max){
+            this.Max  = max;
+            this.Used = used;
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/classes/ListViewMetadata_Tests.cls-meta.xml b/src/classes/LimitsMetadata.cls-meta.xml
similarity index 80%
rename from src/classes/ListViewMetadata_Tests.cls-meta.xml
rename to src/classes/LimitsMetadata.cls-meta.xml
index f3bac1f..800e53c 100644
--- a/src/classes/ListViewMetadata_Tests.cls-meta.xml
+++ b/src/classes/LimitsMetadata.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>41.0</apiVersion>
+    <apiVersion>43.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/src/classes/LimitsMetadata_Tests.cls b/src/classes/LimitsMetadata_Tests.cls
new file mode 100644
index 0000000..c09d239
--- /dev/null
+++ b/src/classes/LimitsMetadata_Tests.cls
@@ -0,0 +1,73 @@
+/*************************************************************************************************
+* This file is part of the SimpleMetadata project, released under the MIT License.               *
+* See LICENSE file or go to https://github.com/jongpie/SimpleMetadata for full license details.  *
+*************************************************************************************************/
+@isTest
+private class LimitsMetadata_Tests {
+
+    @isTest
+    static void it_should_return_limits_metadata() {
+        LimitsMetadata limitsMetadata = new LimitsMetadata();
+        validateAttributesAreSet(limitsMetadata);
+        validateCaseSentivityForJavascript(limitsMetadata);
+    }
+
+    private static void validateAttributesAreSet(LimitsMetadata limitsMetadata) {
+        System.assertEquals(Limits.getAggregateQueries(), limitsMetadata.AggregateQueries.Used);
+        System.assertEquals(Limits.getLimitAggregateQueries(), limitsMetadata.AggregateQueries.Max);
+        System.assertEquals(Limits.getAsyncCalls(), limitsMetadata.AsyncCalls.Used);
+        System.assertEquals(Limits.getLimitAsyncCalls(), limitsMetadata.AsyncCalls.Max);
+        System.assertEquals(Limits.getCallouts(), limitsMetadata.Callouts.Used);
+        System.assertEquals(Limits.getLimitCallouts(), limitsMetadata.Callouts.Max);
+        //System.assertEquals(Limits.getCPUTime(), limitsMetadata.CpuTime.Used);
+        System.assertEquals(Limits.getLimitCPUTime(), limitsMetadata.CpuTime.Max);
+        System.assertEquals(Limits.getDMLRows(), limitsMetadata.DmlRows.Used);
+        System.assertEquals(Limits.getLimitDMLRows(), limitsMetadata.DmlRows.Max);
+        System.assertEquals(Limits.getDMLStatements(), limitsMetadata.DmlStatements.Used);
+        System.assertEquals(Limits.getLimitDMLStatements(), limitsMetadata.DmlStatements.Max);
+        System.assertEquals(Limits.getEmailInvocations(), limitsMetadata.EmailInvocations.Used);
+        System.assertEquals(Limits.getLimitEmailInvocations(), limitsMetadata.EmailInvocations.Max);
+        System.assertEquals(Limits.getFutureCalls(), limitsMetadata.FutureCalls.Used);
+        System.assertEquals(Limits.getLimitFutureCalls(), limitsMetadata.FutureCalls.Max);
+        //System.assertEquals(Limits.getHeapSize(), limitsMetadata.HeapSize.Used);
+        System.assertEquals(Limits.getLimitHeapSize(), limitsMetadata.HeapSize.Max);
+        System.assertEquals(Limits.getMobilePushApexCalls(), limitsMetadata.MobilePushApexCalls.Used);
+        System.assertEquals(Limits.getLimitMobilePushApexCalls(), limitsMetadata.MobilePushApexCalls.Max);
+        System.assertEquals(Limits.getQueueableJobs(), limitsMetadata.QueueableJobs.Used);
+        System.assertEquals(Limits.getLimitQueueableJobs(), limitsMetadata.QueueableJobs.Max);
+        System.assertEquals(Limits.getQueries(), limitsMetadata.SoqlQueries.Used);
+        System.assertEquals(Limits.getLimitQueries(), limitsMetadata.SoqlQueries.Max);
+        System.assertEquals(Limits.getQueryLocatorRows(), limitsMetadata.SoqlQueryLocatorRows.Used);
+        System.assertEquals(Limits.getLimitQueryLocatorRows(), limitsMetadata.SoqlQueryLocatorRows.Max);
+        System.assertEquals(Limits.getQueryRows(), limitsMetadata.SoqlQueryRows.Used);
+        System.assertEquals(Limits.getLimitQueryRows(), limitsMetadata.SoqlQueryRows.Max);
+        System.assertEquals(Limits.getSOSLQueries(), limitsMetadata.SoslSearches.Used);
+        System.assertEquals(Limits.getLimitSoslQueries(), limitsMetadata.SoslSearches.Max);
+    }
+
+    private static void validateCaseSentivityForJavascript(LimitsMetadata limitsMetadata) {
+        // Validate that the attributes are named exactly as expected so that javascript can rely on them
+        String jsonLimitsMetadata = JSON.serialize(limitsMetadata);
+        Map<String, Object> untypedLimitsMetadata = (Map<String, Object>)JSON.deserializeUntyped(jsonLimitsMetadata);
+
+        // One negative to confirm that the strings in our map are case sensitive
+        System.assert(untypedLimitsMetadata.containsKey('AGGREGATEQUERIES') == false);
+        // Now for the 'real' tests
+        System.assert(untypedLimitsMetadata.containsKey('AggregateQueries'));
+        System.assert(untypedLimitsMetadata.containsKey('AsyncCalls'));
+        System.assert(untypedLimitsMetadata.containsKey('Callouts'));
+        System.assert(untypedLimitsMetadata.containsKey('CpuTime'));
+        System.assert(untypedLimitsMetadata.containsKey('DmlRows'));
+        System.assert(untypedLimitsMetadata.containsKey('DmlStatements'));
+        System.assert(untypedLimitsMetadata.containsKey('EmailInvocations'));
+        System.assert(untypedLimitsMetadata.containsKey('FutureCalls'));
+        System.assert(untypedLimitsMetadata.containsKey('HeapSize'));
+        System.assert(untypedLimitsMetadata.containsKey('MobilePushApexCalls'));
+        System.assert(untypedLimitsMetadata.containsKey('QueueableJobs'));
+        System.assert(untypedLimitsMetadata.containsKey('SoqlQueries'));
+        System.assert(untypedLimitsMetadata.containsKey('SoqlQueryLocatorRows'));
+        System.assert(untypedLimitsMetadata.containsKey('SoqlQueryRows'));
+        System.assert(untypedLimitsMetadata.containsKey('SoslSearches'));
+    }
+
+}
\ No newline at end of file
diff --git a/src/classes/SObjectMetadata.cls-meta.xml b/src/classes/LimitsMetadata_Tests.cls-meta.xml
similarity index 80%
rename from src/classes/SObjectMetadata.cls-meta.xml
rename to src/classes/LimitsMetadata_Tests.cls-meta.xml
index f3bac1f..800e53c 100644
--- a/src/classes/SObjectMetadata.cls-meta.xml
+++ b/src/classes/LimitsMetadata_Tests.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>41.0</apiVersion>
+    <apiVersion>43.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/src/classes/ListViewMetadata.cls b/src/classes/ListViewMetadata.cls
deleted file mode 100644
index 921b40b..0000000
--- a/src/classes/ListViewMetadata.cls
+++ /dev/null
@@ -1,67 +0,0 @@
-/*************************************************************************************************
-* This file is part of the SimpleMetadata project, released under the MIT License.               *
-* See LICENSE file or go to https://github.com/jongpie/SimpleMetadata for full license details.  *
-*************************************************************************************************/
-global class ListViewMetadata {
-
-    // Stores cached query results
-    private static final Map<Id, ListView> QUERIED_LIST_VIEWS_BY_ID;
-    private static final Map<String, ListView> QUERIED_LIST_VIEWS_BY_SOBJECT_AND_DEVELOPER_NAME;
-    private static final Map<String, List<String>> QUERIED_LIST_VIEW_NAMES_BY_SOBJECT_NAME;
-
-    static {
-        // Query & cache queues
-        QUERIED_LIST_VIEWS_BY_ID                         = new Map<Id, ListView>();
-        QUERIED_LIST_VIEWS_BY_SOBJECT_AND_DEVELOPER_NAME = new Map<String, ListView>();
-        QUERIED_LIST_VIEW_NAMES_BY_SOBJECT_NAME          = new Map<String, List<String>>();
-
-        for(ListView listView : [SELECT Id, DeveloperName, IsSOQLCompatible, Name, NamespacePrefix, SObjectType FROM ListView]) {
-            String namespace = listView.NamespacePrefix == null ? '' : listView.NamespacePrefix + '__';
-            QUERIED_LIST_VIEWS_BY_ID.put(listView.Id, listView);
-            QUERIED_LIST_VIEWS_BY_SOBJECT_AND_DEVELOPER_NAME.put(listView.SObjectType + buildFullyQualifiedName(listView), listView);
-
-            if(!QUERIED_LIST_VIEW_NAMES_BY_SOBJECT_NAME.containsKey(listView.SObjectType)) {
-                QUERIED_LIST_VIEW_NAMES_BY_SOBJECT_NAME.put(listView.SObjectType, new List<String>{});
-            }
-            List<String> listViewApiNames = QUERIED_LIST_VIEW_NAMES_BY_SOBJECT_NAME.get(listView.SObjectType);
-            listViewApiNames.add(namespace + listView.DeveloperName);
-            QUERIED_LIST_VIEW_NAMES_BY_SOBJECT_NAME.put(listView.SObjectType, listViewApiNames);
-        }
-    }
-
-    public static List<String> getListViewApiNames(String sobjectApiName) {
-        List<String> results = QUERIED_LIST_VIEW_NAMES_BY_SOBJECT_NAME.get(sobjectApiName);
-        if(results != null) results.sort();
-        return results != null ? results : new List<String>();
-    }
-
-    // Method is static so it can be used in static methods and instance methods
-    private static String buildFullyQualifiedName(ListView listView) {
-        return (listView.NamespacePrefix == null ? '' : listView.NamespacePrefix + '__') + listView.DeveloperName;
-    }
-
-    @AuraEnabled global final String apiName           {get; private set;}
-    @AuraEnabled global final Id id                    {get; private set;}
-    @AuraEnabled global final Boolean isSoqlCompatible {get; private set;}
-    @AuraEnabled global final String label             {get; private set;}
-    @AuraEnabled global final String localApiName      {get; private set;}
-    @AuraEnabled global final String namespace         {get; private set;}
-    @AuraEnabled global final String sobjectApiName    {get; private set;}
-
-    global ListViewMetadata(String sobjectApiName, String listViewApiName) {
-        this(QUERIED_LIST_VIEWS_BY_SOBJECT_AND_DEVELOPER_NAME.get(sobjectApiName + listViewApiName).Id);
-    }
-
-    global ListViewMetadata(Id listViewId) {
-        ListView listView = QUERIED_LIST_VIEWS_BY_ID.get(listViewId);
-
-        this.apiName          = buildFullyQualifiedName(listView);
-        this.id               = listView.Id;
-        this.isSoqlCompatible = listView.IsSoqlCompatible;
-        this.label            = listView.Name;
-        this.localApiName     = listView.DeveloperName;
-        this.namespace        = listView.NamespacePrefix;
-        this.sobjectApiName   = listView.SObjectType;
-    }
-
-}
\ No newline at end of file
diff --git a/src/classes/ListViewMetadata_Tests.cls b/src/classes/ListViewMetadata_Tests.cls
deleted file mode 100644
index fd7657a..0000000
--- a/src/classes/ListViewMetadata_Tests.cls
+++ /dev/null
@@ -1,64 +0,0 @@
-/*************************************************************************************************
-* This file is part of the SimpleMetadata project, released under the MIT License.               *
-* See LICENSE file or go to https://github.com/jongpie/SimpleMetadata for full license details.  *
-*************************************************************************************************/
-@isTest
-private class ListViewMetadata_Tests {
-
-    @isTest
-    static void it_should_return_metadata_for_sobject_api_name_and_list_view_api_name() {
-        ListView listView = [SELECT Id, IsSoqlCompatible, Name, DeveloperName, NamespacePrefix, SObjectType FROM ListView LIMIT 1];
-
-        Test.startTest();
-
-        String namespace = listView.NamespacePrefix == null ? '' : listView.NamespacePrefix + '__';
-        ListViewMetadata listViewMetadata = new ListViewMetadata(listView.SObjectType, namespace + listView.DeveloperName);
-        validateAttributesAreSet(listView, listViewMetadata);
-        validateCaseSentivityForJavascript(listViewMetadata);
-
-        Test.stopTest();
-    }
-
-    @isTest
-    static void it_should_return_metadata_for_list_view_id() {
-        ListView listView = [SELECT Id, IsSoqlCompatible, Name, DeveloperName, NamespacePrefix, SObjectType FROM ListView LIMIT 1];
-
-        Test.startTest();
-
-        ListViewMetadata listViewMetadata = new ListViewMetadata(listView.Id);
-        validateAttributesAreSet(listView, listViewMetadata);
-        validateCaseSentivityForJavascript(listViewMetadata);
-
-        Test.stopTest();
-    }
-
-    private static void validateAttributesAreSet(ListView listView, ListViewMetadata listViewMetadata) {
-        String apiName = (listView.NamespacePrefix == null ? '' : listView.NamespacePrefix + '__') + listView.DeveloperName;
-
-        System.assertEquals(apiName, listViewMetadata.apiName);
-        System.assertEquals(listView.Id, listViewMetadata.id);
-        System.assertEquals(listView.IsSoqlCompatible, listViewMetadata.isSoqlCompatible);
-        System.assertEquals(listView.Name, listViewMetadata.label);
-        System.assertEquals(listView.DeveloperName, listViewMetadata.localApiName);
-        System.assertEquals(listView.NamespacePrefix, listViewMetadata.namespace);
-        System.assertEquals(listView.SObjectType, listViewMetadata.sobjectApiName);
-    }
-
-    private static void validateCaseSentivityForJavascript(ListViewMetadata listviewmetadata) {
-        // Validate that the attributes are named exactly as expected so that javascript can rely on them
-        String jsonListViewMetadata = JSON.serialize(listviewmetadata);
-        Map<String, Object> untypedListViewMetadata = (Map<String, Object>)JSON.deserializeUntyped(jsonListViewMetadata);
-
-        // One negative to confirm that the strings in our map are case sensitive
-        System.assert(untypedListViewMetadata.containsKey('APINAME') == false);
-        // Now for the 'real' tests
-        System.assert(untypedListViewMetadata.containsKey('apiName'));
-        System.assert(untypedListViewMetadata.containsKey('id'));
-        System.assert(untypedListViewMetadata.containsKey('isSoqlCompatible'));
-        System.assert(untypedListViewMetadata.containsKey('label'));
-        System.assert(untypedListViewMetadata.containsKey('localApiName'));
-        System.assert(untypedListViewMetadata.containsKey('namespace'));
-        System.assert(untypedListViewMetadata.containsKey('sobjectApiName'));
-    }
-
-}
\ No newline at end of file
diff --git a/src/classes/LookupController.cls b/src/classes/LookupController.cls
index f744d67..a3d637e 100644
--- a/src/classes/LookupController.cls
+++ b/src/classes/LookupController.cls
@@ -5,27 +5,27 @@
 public with sharing class LookupController {
 
     @AuraEnabled
-    public static List<MatchingRecord> search(String parentSObjectApiName, String searchFieldApiName, String searchText, String displayFieldApiName, Integer limitCount) {
+    public static List<MatchingRecord> search(String parentSobjectApiName, String searchFieldApiName, String searchText, String displayFieldApiName, Integer limitCount) {
         try {
-            Schema.DescribeSObjectResult parentSObjectDescribe = Schema.getGlobalDescribe().get(parentSObjectApiName).getDescribe();
-            SObjectMetadata parentSObjectMetadata = new SObjectMetadata(parentSObjectApiName);
+            Schema.DescribeSobjectResult parentSobjectDescribe = Schema.getGlobalDescribe().get(parentSobjectApiName).getDescribe();
+            SobjectMetadata parentSobjectMetadata = new SobjectMetadata(parentSobjectApiName);
 
-            String query = 'SELECT Id, ' + displayFieldApiName + ' FROM ' + parentSObjectApiName;
+            String query = 'SELECT Id, ' + displayFieldApiName + ' FROM ' + parentSobjectApiName;
 
             if(!String.isEmpty(searchText)) {
                 searchText = '\'%' + String.escapeSingleQuotes(searchText.trim()) + '%\'';
                 query += ' WHERE ' + searchFieldApiName + ' LIKE ' + searchText;
             }
 
-            Boolean canSortByLastViewdDate = parentSObjectDescribe.fields.getMap().containsKey('LastViewedDate') && String.isEmpty(searchText);
-            String sortByField = canSortByLastViewdDate ? 'LastViewedDate DESC NULLS LAST' : parentSObjectMetadata.displayFieldApiName;
+            Boolean canSortByLastViewdDate = parentSobjectDescribe.fields.getMap().containsKey('LastViewedDate') && String.isEmpty(searchText);
+            String sortByField = canSortByLastViewdDate ? 'LastViewedDate DESC NULLS LAST' : parentSobjectMetadata.DisplayFieldApiName;
             query += ' ORDER BY ' + sortByField
                 + ' LIMIT ' + limitCount;
 
             System.debug('query=' + query);
 
             List<MatchingRecord> searchResults = new List<MatchingRecord>();
-            for(SObject record : Database.query(query)) {
+            for(Sobject record : Database.query(query)) {
                 MatchingRecord matchingRecord = new MatchingRecord(record);
                 searchResults.add(matchingRecord);
             }
@@ -41,30 +41,32 @@ public with sharing class LookupController {
     public static MatchingRecord getRecord(Id recordId) {
         if(recordId == null) return null;
 
-        Schema.SObjectType sobjectType = recordId.getSObjectType();
-        SObjectMetadata sobjectMetadata = new SObjectMetadata(sobjectType);
-        List<String> fields = new List<String>{'Id', sobjectMetadata.displayFieldApiName};
+        Schema.SobjectType sobjectType = recordId.getSobjectType();
+        SobjectMetadata sobjectMetadata = new SobjectMetadata(sobjectType);
+        List<String> fields = new List<String>{'Id', sobjectMetadata.DisplayFieldApiName};
 
         String query = 'SELECT ' + String.join(fields, ', ')
-            + ' FROM ' + sobjectMetadata.apiName
+            + ' FROM ' + sobjectMetadata.ApiName
             + ' WHERE Id = \'' + recordId + '\'';
 
-        SObject record = Database.query(query);
+        Sobject record = Database.query(query);
         return new MatchingRecord(record);
     }
 
     public class MatchingRecord {
-        @AuraEnabled public SObject record     {get;private set;}
-        @AuraEnabled public String displayText {get;private set;}
-        @AuraEnabled public String sobjectName {get;private set;}
 
-        public MatchingRecord(SObject record) {
+        @AuraEnabled public Sobject Record     {get;private set;}
+        @AuraEnabled public String DisplayText {get;private set;}
+        @AuraEnabled public String SobjectName {get;private set;}
+
+        public MatchingRecord(Sobject record) {
             this.record = record;
 
-            SObjectMetadata sobjectMetadata = new SObjectMetadata(record.getSObjectType());
-            this.sobjectName = sobjectMetadata.apiName;
-            this.displayText = (String)record.get(sobjectMetadata.displayFieldApiName);
+            SobjectMetadata sobjectMetadata = new SobjectMetadata(record.getSobjectType());
+            this.sobjectName = sobjectMetadata.ApiName;
+            this.displayText = (String)record.get(sobjectMetadata.DisplayFieldApiName);
         }
+
     }
 
 }
\ No newline at end of file
diff --git a/src/classes/LookupController.cls-meta.xml b/src/classes/LookupController.cls-meta.xml
index f3bac1f..800e53c 100644
--- a/src/classes/LookupController.cls-meta.xml
+++ b/src/classes/LookupController.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>41.0</apiVersion>
+    <apiVersion>43.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/src/classes/LookupController_Tests.cls-meta.xml b/src/classes/LookupController_Tests.cls-meta.xml
index f3bac1f..800e53c 100644
--- a/src/classes/LookupController_Tests.cls-meta.xml
+++ b/src/classes/LookupController_Tests.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>41.0</apiVersion>
+    <apiVersion>43.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/src/classes/QueueMetadata.cls b/src/classes/QueueMetadata.cls
index d347626..faea339 100644
--- a/src/classes/QueueMetadata.cls
+++ b/src/classes/QueueMetadata.cls
@@ -2,7 +2,7 @@
 * This file is part of the SimpleMetadata project, released under the MIT License.               *
 * See LICENSE file or go to https://github.com/jongpie/SimpleMetadata for full license details.  *
 *************************************************************************************************/
-global virtual class QueueMetadata {
+global class QueueMetadata {
 
     // Stores cached query results
     private static final Map<Id, Group> QUERIED_QUEUES_BY_ID;
@@ -14,8 +14,8 @@ global virtual class QueueMetadata {
         QUERIED_QUEUES_BY_DEVELOPER_NAME = new Map<String, Group>();
 
         for(Group queue : [
-            SELECT DeveloperName, DoesIncludeBosses, DoesSendEmailToMembers, Email, Id, Name, OwnerId, Owner.Name, Owner.Type, RelatedId,
-                (SELECT Id, SObjectType FROM QueueSObjects),
+            SELECT DeveloperName, DoesIncludeBosses, DoesSendEmailToMembers, Email, Id, Name,
+                (SELECT SobjectType FROM QueueSobjects),
                 (SELECT Id, GroupId, UserOrGroupId FROM GroupMembers)
             FROM Group
             WHERE Type = 'Queue'
@@ -31,17 +31,14 @@ global virtual class QueueMetadata {
         return queueApiNames;
     }
 
-    @AuraEnabled global final String apiName                         {get; private set;}
-    @AuraEnabled global final Boolean doesIncludeBosses              {get; private set;}
-    @AuraEnabled global final Boolean doesSendEmailToMembers         {get; private set;}
-    @AuraEnabled global final String email                           {get; private set;}
-    @AuraEnabled global final Id id                                  {get; private set;}
-    @AuraEnabled global final String label                           {get; private set;}
-    @AuraEnabled global final Id ownerId                             {get; private set;}
-    @AuraEnabled global final String ownerName                       {get; private set;}
-    @AuraEnabled global final String ownerType                       {get; private set;}
-    @AuraEnabled global final List<String> supportedSObjectApiNames  {get; private set;}
-    @AuraEnabled global final List<QueueMemberMetadata> queueMembers {get; private set;}
+    @AuraEnabled global final String ApiName                         {get; private set;}
+    @AuraEnabled global final Boolean DoesIncludeBosses              {get; private set;}
+    @AuraEnabled global final Boolean DoesSendEmailToMembers         {get; private set;}
+    @AuraEnabled global final String Email                           {get; private set;}
+    @AuraEnabled global final Id Id                                  {get; private set;}
+    @AuraEnabled global final String Label                           {get; private set;}
+    @AuraEnabled global final List<QueueMemberMetadata> QueueMembers {get; private set;}
+    @AuraEnabled global final List<String> SobjectApiNames           {get; private set;}
 
     global QueueMetadata(String queueApiName) {
         this(QUERIED_QUEUES_BY_DEVELOPER_NAME.get(queueApiName).Id);
@@ -50,17 +47,14 @@ global virtual class QueueMetadata {
     global QueueMetadata(Id queueId) {
         Group queue = QUERIED_QUEUES_BY_ID.get(queueId);
 
-        this.apiName                  = queue.DeveloperName;
-        this.doesIncludeBosses        = queue.DoesIncludeBosses;
-        this.doesSendEmailToMembers   = queue.DoesSendEmailToMembers;
-        this.email                    = queue.Email;
-        this.id                       = queue.Id;
-        this.label                    = queue.Name;
-        this.ownerId                  = queue.OwnerId;
-        this.ownerName                = queue.Owner.Name;
-        this.ownerType                = queue.Owner.Type;
-        this.queueMembers             = this.getQueueMembers(queue);
-        this.supportedSObjectApiNames = this.getSupportedSObjectApiNames(queue);
+        this.ApiName                  = queue.DeveloperName;
+        this.DoesIncludeBosses        = queue.DoesIncludeBosses;
+        this.DoesSendEmailToMembers   = queue.DoesSendEmailToMembers;
+        this.Email                    = queue.Email;
+        this.Id                       = queue.Id;
+        this.Label                    = queue.Name;
+        this.QueueMembers             = this.getQueueMembers(queue);
+        this.SobjectApiNames          = this.getSobjectApiNames(queue);
     }
 
     private List<QueueMemberMetadata> getQueueMembers(Group queue) {
@@ -68,30 +62,39 @@ global virtual class QueueMetadata {
         for(GroupMember queueMember : queue.GroupMembers) {
             queueMembers.add(new QueueMemberMetadata(queueMember));
         }
+        queueMembers.sort();
         return queueMembers;
     }
 
-    private List<String> getSupportedSObjectApiNames(Group queue) {
-        List<String> supportedSObjectApiNames = new List<String>();
-        for(QueueSObject queueSObject : queue.QueueSObjects) {
-            supportedSObjectApiNames.add(queueSObject.SObjectType);
+    private List<String> getSobjectApiNames(Group queue) {
+        List<String> sobjectApiNames = new List<String>();
+        for(QueueSobject queueSobject : queue.QueueSobjects) {
+            sobjectApiNames.add(queueSobject.SobjectType);
         }
-        supportedSObjectApiNames.sort();
-        return supportedSObjectApiNames;
+        sobjectApiNames.sort();
+        return sobjectApiNames;
     }
 
-    global class QueueMemberMetadata {
+    global class QueueMemberMetadata implements Comparable {
 
-        @AuraEnabled global final Id id            {get; private set;}
-        @AuraEnabled global final Id queueId       {get; private set;}
-        @AuraEnabled global final String type      {get; private set;}
-        @AuraEnabled global final Id userOrGroupId {get; private set;}
+        @AuraEnabled global final Id Id            {get; private set;}
+        @AuraEnabled global final Id QueueId       {get; private set;}
+        @AuraEnabled global final String Type      {get; private set;}
+        @AuraEnabled global final Id UserOrGroupId {get; private set;}
+
+        global Integer compareTo(Object compareTo) {
+            QueueMemberMetadata compareToQueueMember = (QueueMemberMetadata)compareTo;
+
+            if(this.UserOrGroupId == compareToQueueMember.UserOrGroupId) return 0;
+            else if(this.UserOrGroupId > compareToQueueMember.UserOrGroupId) return 1;
+            else return -1;
+        }
 
         private QueueMemberMetadata(GroupMember groupMember) {
-            this.id            = groupMember.Id;
-            this.queueId       = groupMember.GroupId;
-            this.type          = String.valueOf(groupMember.UserOrGroupId.getSObjectType());
-            this.userOrGroupId = groupMember.UserOrGroupId;
+            this.Id            = groupMember.Id;
+            this.QueueId       = groupMember.GroupId;
+            this.Type          = String.valueOf(groupMember.UserOrGroupId.getSobjectType());
+            this.UserOrGroupId = groupMember.UserOrGroupId;
         }
 
     }
diff --git a/src/classes/QueueMetadata.cls-meta.xml b/src/classes/QueueMetadata.cls-meta.xml
index f3bac1f..800e53c 100644
--- a/src/classes/QueueMetadata.cls-meta.xml
+++ b/src/classes/QueueMetadata.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>41.0</apiVersion>
+    <apiVersion>43.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/src/classes/QueueMetadata_Tests.cls b/src/classes/QueueMetadata_Tests.cls
index 9ce5979..056b9b7 100644
--- a/src/classes/QueueMetadata_Tests.cls
+++ b/src/classes/QueueMetadata_Tests.cls
@@ -13,9 +13,9 @@ private class QueueMetadata_Tests {
         Group queue = new Group(DeveloperName = queueDeveloperName, Name = queueDeveloperName, Type = 'Queue');
         insert queue;
 
-        // Create queue SObject
-        QueueSObject queueCaseSObject = new QueueSObject(QueueId = queue.Id, SObjectType = 'Case');
-        insert queueCaseSObject;
+        // Create queue Sobject
+        QueueSobject queueCaseSobject = new QueueSobject(QueueId = queue.Id, SobjectType = 'Case');
+        insert queueCaseSobject;
 
         // Create queue members
         List<GroupMember> queueMembers = new List<GroupMember>();
@@ -66,15 +66,12 @@ private class QueueMetadata_Tests {
     }
 
     private static void validateAttributesAreSet(Group queue, QueueMetadata queueMetadata) {
-        System.assertEquals(queue.DeveloperName, queueMetadata.apiName);
-        System.assertEquals(queue.DoesIncludeBosses, queueMetadata.doesIncludeBosses);
-        System.assertEquals(queue.DoesSendEmailToMembers, queueMetadata.doesSendEmailToMembers);
-        System.assertEquals(queue.Email, queueMetadata.email);
-        System.assertEquals(queue.Name, queueMetadata.label);
-        System.assertEquals(queue.OwnerId, queueMetadata.ownerId);
-        System.assertEquals(queue.Owner.Name, queueMetadata.ownerName);
-        System.assertEquals(queue.Owner.Type, queueMetadata.ownerType);
-        System.assertEquals(queue.Id, queueMetadata.id);
+        System.assertEquals(queue.DeveloperName, queueMetadata.ApiName);
+        System.assertEquals(queue.DoesIncludeBosses, queueMetadata.DoesIncludeBosses);
+        System.assertEquals(queue.DoesSendEmailToMembers, queueMetadata.DoesSendEmailToMembers);
+        System.assertEquals(queue.Email, queueMetadata.Email);
+        System.assertEquals(queue.Id, queueMetadata.Id);
+        System.assertEquals(queue.Name, queueMetadata.Label);
     }
 
     private static void validateCaseSentivityForJavascript(QueueMetadata queueMetadata) {
@@ -85,17 +82,14 @@ private class QueueMetadata_Tests {
         // One negative to confirm that the strings in our map are case sensitive
         System.assert(untypedQueueMetadata.containsKey('APINAME') == false);
         // Now for the 'real' tests
-        System.assert(untypedQueueMetadata.containsKey('apiName'));
-        System.assert(untypedQueueMetadata.containsKey('doesIncludeBosses'));
-        System.assert(untypedQueueMetadata.containsKey('doesSendEmailToMembers'));
-        System.assert(untypedQueueMetadata.containsKey('email'));
-        System.assert(untypedQueueMetadata.containsKey('id'));
-        System.assert(untypedQueueMetadata.containsKey('label'));
-        System.assert(untypedQueueMetadata.containsKey('ownerId'));
-        System.assert(untypedQueueMetadata.containsKey('ownerName'));
-        System.assert(untypedQueueMetadata.containsKey('ownerType'));
-        System.assert(untypedQueueMetadata.containsKey('supportedSObjectApiNames'));
-        System.assert(untypedQueueMetadata.containsKey('queueMembers'));
+        System.assert(untypedQueueMetadata.containsKey('ApiName'));
+        System.assert(untypedQueueMetadata.containsKey('DoesIncludeBosses'));
+        System.assert(untypedQueueMetadata.containsKey('DoesSendEmailToMembers'));
+        System.assert(untypedQueueMetadata.containsKey('Email'));
+        System.assert(untypedQueueMetadata.containsKey('Id'));
+        System.assert(untypedQueueMetadata.containsKey('Label'));
+        System.assert(untypedQueueMetadata.containsKey('QueueMembers'));
+        System.assert(untypedQueueMetadata.containsKey('SobjectApiNames'));
     }
 
 }
\ No newline at end of file
diff --git a/src/classes/QueueMetadata_Tests.cls-meta.xml b/src/classes/QueueMetadata_Tests.cls-meta.xml
index f3bac1f..800e53c 100644
--- a/src/classes/QueueMetadata_Tests.cls-meta.xml
+++ b/src/classes/QueueMetadata_Tests.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>41.0</apiVersion>
+    <apiVersion>43.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/src/classes/RecordTypeMetadata.cls b/src/classes/RecordTypeMetadata.cls
index 4930ad4..4581241 100644
--- a/src/classes/RecordTypeMetadata.cls
+++ b/src/classes/RecordTypeMetadata.cls
@@ -2,90 +2,67 @@
 * This file is part of the SimpleMetadata project, released under the MIT License.               *
 * See LICENSE file or go to https://github.com/jongpie/SimpleMetadata for full license details.  *
 *************************************************************************************************/
-global virtual class RecordTypeMetadata {
+ global class RecordTypeMetadata implements Comparable {
 
-    // Stores cached query results
-    private static final Map<Id, RecordType> QUERIED_RECORD_TYPES_BY_ID;
-    private static final Map<String, RecordType> QUERIED_RECORD_TYPES_BY_SOBJECT_AND_DEVELOPER_API_NAME;
-    private static final Map<String, List<String>> QUERIED_RECORD_TYPE_NAMES_BY_SOBJECT_API_NAME;
-
-    static {
-        // Query & cache Record_Types
-        QUERIED_RECORD_TYPES_BY_ID                         = new Map<Id, RecordType>();
-        // Salesforce enforces the combination of sobject name + record type developer name to be unique,
-        // so we can use the combination as the key in a map
-        QUERIED_RECORD_TYPES_BY_SOBJECT_AND_DEVELOPER_API_NAME = new Map<String, RecordType>();
-        QUERIED_RECORD_TYPE_NAMES_BY_SOBJECT_API_NAME            = new Map<String, List<String>>();
-
-        for(RecordType recordType : [SELECT Id, BusinessProcessId, Description, DeveloperName, NamespacePrefix, SObjectType FROM RecordType]) {
-            String namespace = recordType.NamespacePrefix == null ? '' : recordType.NamespacePrefix + '__';
-            QUERIED_RECORD_TYPES_BY_ID.put(recordType.Id, recordType);
-            QUERIED_RECORD_TYPES_BY_SOBJECT_AND_DEVELOPER_API_NAME.put(recordType.SObjectType + namespace + recordType.DeveloperName, recordType);
-
-            if(!QUERIED_RECORD_TYPE_NAMES_BY_SOBJECT_API_NAME.containsKey(recordType.SObjectType)) {
-                QUERIED_RECORD_TYPE_NAMES_BY_SOBJECT_API_NAME.put(recordType.SObjectType, new List<String>{});
-            }
-            List<String> recordTypeApiNames = QUERIED_RECORD_TYPE_NAMES_BY_SOBJECT_API_NAME.get(recordType.SObjectType);
-            recordTypeApiNames.add(namespace + recordType.DeveloperName);
-            QUERIED_RECORD_TYPE_NAMES_BY_SOBJECT_API_NAME.put(recordType.SObjectType, recordTypeApiNames);
-        }
-    }
-
-    public static List<String> getRecordTypeApiNames(String sobjectApiName) {
-        List<String> results = QUERIED_RECORD_TYPE_NAMES_BY_SOBJECT_API_NAME.get(sobjectApiName);
-        if(results != null) results.sort();
-        return results != null ? results : new List<String>();
-    }
-
-    @AuraEnabled global final String apiName        {get; private set;}
-    @AuraEnabled global final Id businessProcessId  {get; private set;}
-    @AuraEnabled global final String description    {get; private set;}
-    @AuraEnabled global final Id id                 {get; private set;}
-    @AuraEnabled global final Boolean isActive      {get; private set;}
-    @AuraEnabled global final Boolean isAvailable   {get; private set;}
-    @AuraEnabled global final Boolean isDefault     {get; private set;}
-    @AuraEnabled global final Boolean isMaster      {get; private set;}
-    @AuraEnabled global final String label          {get; private set;}
-    @AuraEnabled global final String localApiName   {get; private set;}
-    @AuraEnabled global final String namespace      {get; private set;}
-    @AuraEnabled global final String sobjectApiName {get; private set;}
+    @AuraEnabled global final String ApiName        {get; private set;}
+    @AuraEnabled global final Id Id                 {get; private set;}
+    @AuraEnabled global final Boolean IsActive      {get; private set;}
+    @AuraEnabled global final Boolean IsAvailable   {get; private set;}
+    @AuraEnabled global final Boolean IsDefault     {get; private set;}
+    @AuraEnabled global final Boolean IsMaster      {get; private set;}
+    @AuraEnabled global final String Label          {get; private set;}
+    @AuraEnabled global final String LocalApiName   {get; private set;}
+    @AuraEnabled global final String Namespace      {get; private set;}
+    @AuraEnabled global final String SobjectApiName {get; private set;}
 
     global RecordTypeMetadata(String sobjectApiName, String recordTypeApiName) {
-        this(QUERIED_RECORD_TYPES_BY_SOBJECT_AND_DEVELOPER_API_NAME.get(sobjectApiName + recordTypeApiName).Id);
+        this(
+            Schema.getGlobalDescribe().get(sobjectApiName),
+            Schema.getGlobalDescribe().get(sobjectApiName).getDescribe().getRecordTypeInfosByDeveloperName().get(recordTypeApiName)
+        );
     }
 
-    global RecordTypeMetadata(Id recordTypeId) {
+    global RecordTypeMetadata(Schema.SobjectType sobjectType, Id recordTypeId) {
         this(
-            Schema.getGlobalDescribe().get(QUERIED_RECORD_TYPES_BY_ID.get(recordTypeId).SObjectType),
-            Schema.getGlobalDescribe().get(QUERIED_RECORD_TYPES_BY_ID.get(recordTypeId).SObjectType).getDescribe().getRecordTypeInfosById().get(recordTypeId)
+            sobjectType,
+            sobjectType.getDescribe().getRecordTypeInfosById().get(recordTypeId)
         );
     }
 
-    global RecordTypeMetadata(Schema.SObjectType sobjectType, Schema.RecordTypeInfo recordTypeInfo) {
-        // recordType can be null because default master record types do not exist in the RecordType object that's queried with SOQL
-        RecordType recordType = QUERIED_RECORD_TYPES_BY_ID.get(recordTypeInfo.getRecordTypeId());
+    global RecordTypeMetadata(Schema.SobjectType sobjectType, Schema.RecordTypeInfo recordTypeInfo) {
+        this.ApiName        = this.getApiName(recordTypeInfo);
+        this.Id             = recordTypeInfo.getRecordTypeId();
+        this.IsActive       = recordTypeInfo.isActive();
+        this.IsAvailable    = recordTypeInfo.isAvailable();
+        this.IsDefault      = recordTypeInfo.isDefaultRecordTypeMapping();
+        this.IsMaster       = recordTypeInfo.isMaster();
+        this.Label          = recordTypeInfo.getName();
+        this.LocalApiName   = this.getLocalApiName(recordTypeInfo.getDeveloperName());
+        this.Namespace      = this.getNamespace(recordTypeInfo.getDeveloperName());
+        this.SobjectApiName = String.valueOf(sobjectType);
+    }
+
+    global Integer compareTo(Object compareTo) {
+        RecordTypeMetadata compareToRecordTypeMetadata = (RecordTypeMetadata)compareTo;
+        String key          = this.SobjectApiName + this.ApiName;
+        String compareToKey = compareToRecordTypeMetadata.SobjectApiName + compareToRecordTypeMetadata.ApiName;
 
-        this.apiName           = this.getApiName(recordType);
-        this.businessProcessId = recordType == null ? null : recordType.BusinessProcessId;
-        this.description       = recordType == null ? null : recordType.Description;
-        this.id                = recordTypeInfo.getRecordTypeId();
-        this.isActive          = recordTypeInfo.isActive();
-        this.isAvailable       = recordTypeInfo.isAvailable();
-        this.isDefault         = recordTypeInfo.isDefaultRecordTypeMapping();
-        this.isMaster          = recordTypeInfo.isMaster();
-        this.label             = recordTypeInfo.getName();
-        this.localApiName      = recordType == null ? null : recordType.DeveloperName;
-        this.namespace         = recordType == null ? null : recordType.NamespacePrefix;
-        this.sobjectApiName    = String.valueOf(sobjectType);
+        if(key == compareToKey) return 0;
+        else if(key > compareToKey) return 1;
+        else return -1;
     }
 
-    private String getApiName(RecordType recordType) {
-        if(recordType == null) return null;
+    private String getApiName(Schema.RecordTypeInfo recordTypeInfo) {
+        String namespacePrefix = String.isEmpty(this.getNamespace(recordTypeInfo.getDeveloperName())) ? '' : this.getNamespace(recordTypeInfo.getDeveloperName()) + '__';
+        return namespacePrefix + recordTypeInfo.getDeveloperName();
+    }
 
-        String namespacePrefix = '';
-        if(recordType.NamespacePrefix != null) namespacePrefix = recordType.NamespacePrefix + '__';
+    private String getLocalApiName(String apiName) {
+        return apiName.contains('__') ? apiName.substringAfter('__') : apiName;
+    }
 
-        return namespacePrefix + recordType.DeveloperName;
+    private String getNamespace(String apiName) {
+        return apiName.contains('__') ? apiName.substringBefore('__') : null;
     }
 
 }
\ No newline at end of file
diff --git a/src/classes/RecordTypeMetadata.cls-meta.xml b/src/classes/RecordTypeMetadata.cls-meta.xml
index f3bac1f..800e53c 100644
--- a/src/classes/RecordTypeMetadata.cls-meta.xml
+++ b/src/classes/RecordTypeMetadata.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>41.0</apiVersion>
+    <apiVersion>43.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/src/classes/RecordTypeMetadata_Tests.cls b/src/classes/RecordTypeMetadata_Tests.cls
index 1d3ef0a..96c786d 100644
--- a/src/classes/RecordTypeMetadata_Tests.cls
+++ b/src/classes/RecordTypeMetadata_Tests.cls
@@ -5,28 +5,34 @@
 @isTest
 private class RecordTypeMetadata_Tests {
 
+    private static final String ORG_NAMESPACE_PREFIX;
+
+    static {
+        ORG_NAMESPACE_PREFIX = [SELECT NamespacePrefix FROM Organization].NamespacePrefix;
+    }
+
     @isTest
     static void it_should_return_record_type_metadata_for_record_type_info() {
         // For larger orgs with a lot of record types, we don't need to test every record type
         // We'll keep a count and stop after 5 to keep tests quick
         Integer count = 0;
 
-        Schema.SObjectType accountSObjectType = Schema.Account.SObjectType;
-        for(Schema.RecordTypeInfo recordTypeInfo : Schema.SObjectType.Account.getRecordTypeInfos()) {
+        Schema.SobjectType accountSobjectType = Schema.Account.SobjectType;
+        for(Schema.RecordTypeInfo recordTypeInfo : Schema.SobjectType.Account.getRecordTypeInfos()) {
             if(count >= 5) break;
 
-            RecordTypeMetadata recordTypeMetadata = new RecordTypeMetadata(accountSObjectType, recordTypeInfo);
+            RecordTypeMetadata recordTypeMetadata = new RecordTypeMetadata(accountSobjectType, recordTypeInfo);
             count++;
         }
     }
 
     @isTest
     static void it_should_return_record_type_metadata_for_sobject_and_record_type_api_names() {
-        for(RecordType recordType : [SELECT Id, BusinessProcessId, Description, DeveloperName, NamespacePrefix, SObjectType FROM RecordType LIMIT 5]) {
-            Schema.RecordTypeInfo recordTypeInfo = Schema.getGlobalDescribe().get(recordType.SObjectType).getDescribe().getRecordTypeInfosById().get(recordType.Id);
-            String namespace = recordType.NamespacePrefix == null ? '' : recordType.NamespacePrefix + '__';
-            RecordTypeMetadata recordTypeMetadata = new RecordTypeMetadata(recordType.SObjectType, namespace + recordType.DeveloperName);
-            validateAttributesAreSet(recordTypeInfo, recordType, recordType.SObjectType, recordTypeMetadata);
+        for(RecordType recordType : [SELECT Id, BusinessProcessId, Description, DeveloperName, NamespacePrefix, SobjectType FROM RecordType LIMIT 5]) {
+            Schema.RecordTypeInfo recordTypeInfo = Schema.getGlobalDescribe().get(recordType.SobjectType).getDescribe().getRecordTypeInfosById().get(recordType.Id);
+            String namespace = recordType.NamespacePrefix == null || recordType.NamespacePrefix == ORG_NAMESPACE_PREFIX ? '' : recordType.NamespacePrefix + '__';
+            RecordTypeMetadata recordTypeMetadata = new RecordTypeMetadata(recordType.SobjectType, namespace + recordType.DeveloperName);
+            validateAttributesAreSet(recordTypeInfo, recordType, recordType.SobjectType, recordTypeMetadata);
             validateCaseSentivityForJavascript(recordTypeMetadata);
         }
     }
@@ -34,7 +40,7 @@ private class RecordTypeMetadata_Tests {
     @isTest
     static void it_should_return_record_type_metadata_for_record_type_id() {
         Schema.RecordTypeInfo queryableRecordTypeInfo;
-        for(Schema.RecordTypeInfo recordTypeInfo : Schema.SObjectType.Account.getRecordTypeInfos()) {
+        for(Schema.RecordTypeInfo recordTypeInfo : Schema.SobjectType.Account.getRecordTypeInfos()) {
             if(recordTypeInfo.isMaster()) continue;
 
             queryableRecordTypeInfo = recordTypeInfo;
@@ -43,32 +49,34 @@ private class RecordTypeMetadata_Tests {
 
         if(queryableRecordTypeInfo == null) return; // This will be null in orgs with no record types, so the test can't finish
 
-        RecordTypeMetadata recordTypeMetadata = new RecordTypeMetadata(queryableRecordTypeInfo.getRecordTypeId());
+        RecordTypeMetadata recordTypeMetadata = new RecordTypeMetadata(Schema.Account.SobjectType, queryableRecordTypeInfo.getRecordTypeId());
         RecordType recordType = [
-            SELECT Id, BusinessProcessId, Description, DeveloperName, NamespacePrefix, SObjectType
+            SELECT Id, DeveloperName, NamespacePrefix, SobjectType
             FROM RecordType WHERE Id = :queryableRecordTypeInfo.getRecordTypeId()
         ];
-        validateAttributesAreSet(queryableRecordTypeInfo, recordType, recordType.SObjectType, recordTypeMetadata);
+        validateAttributesAreSet(queryableRecordTypeInfo, recordType, recordType.SobjectType, recordTypeMetadata);
         validateCaseSentivityForJavascript(recordTypeMetadata);
     }
 
     private static void validateAttributesAreSet(RecordTypeInfo recordTypeInfo, RecordType recordType, String sobjectApiName, RecordTypeMetadata recordTypeMetadata) {
+        String namespace;
         String namespacePrefix = '';
-        if(recordType != null && recordType.NamespacePrefix != null) namespacePrefix = recordType.NamespacePrefix + '__';
+        if(recordType != null && recordType.NamespacePrefix != null && recordType.NamespacePrefix != ORG_NAMESPACE_PREFIX) {
+            namespace = recordType.NamespacePrefix;
+            namespacePrefix = recordType.NamespacePrefix + '__';
+        }
         String recordTypeName = recordType == null ? null : namespacePrefix + recordType.DeveloperName;
 
-        System.assertEquals(recordType == null ? null : recordTypeName, recordTypeMetadata.apiName);
-        System.assertEquals(recordType == null ? null : recordType.BusinessProcessId, recordTypeMetadata.businessProcessId);
-        System.assertEquals(recordType == null ? null : recordType.Description, recordTypeMetadata.description);
-        System.assertEquals(recordTypeInfo.getRecordTypeId(), recordTypeMetadata.id);
-        System.assertEquals(recordTypeInfo.isActive(), recordTypeMetadata.isActive);
-        System.assertEquals(recordTypeInfo.isAvailable(), recordTypeMetadata.isAvailable);
-        System.assertEquals(recordTypeInfo.isDefaultRecordTypeMapping(), recordTypeMetadata.isDefault);
-        System.assertEquals(recordTypeInfo.isMaster(), recordTypeMetadata.isMaster);
-        System.assertEquals(recordTypeInfo.getName(), recordTypeMetadata.label);
-        System.assertEquals(recordType == null ? null : recordType.DeveloperName, recordTypeMetadata.localApiName);
-        System.assertEquals(recordType == null ? null : recordType.NamespacePrefix, recordTypeMetadata.namespace);
-        System.assertEquals(sobjectApiName, recordTypeMetadata.sobjectApiName);
+        System.assertEquals(recordType == null ? null : recordTypeName, recordTypeMetadata.ApiName);
+        System.assertEquals(recordTypeInfo.getRecordTypeId(), recordTypeMetadata.Id);
+        System.assertEquals(recordTypeInfo.isActive(), recordTypeMetadata.IsActive);
+        System.assertEquals(recordTypeInfo.isAvailable(), recordTypeMetadata.IsAvailable);
+        System.assertEquals(recordTypeInfo.isDefaultRecordTypeMapping(), recordTypeMetadata.IsDefault);
+        System.assertEquals(recordTypeInfo.isMaster(), recordTypeMetadata.IsMaster);
+        System.assertEquals(recordTypeInfo.getName(), recordTypeMetadata.Label);
+        System.assertEquals(recordType == null ? null : recordType.DeveloperName, recordTypeMetadata.LocalApiName);
+        System.assertEquals(recordType == null ? null : namespace, recordTypeMetadata.Namespace);
+        System.assertEquals(sobjectApiName, recordTypeMetadata.SobjectApiName);
     }
 
     private static void validateCaseSentivityForJavascript(RecordTypeMetadata recordTypeMetadata) {
@@ -79,18 +87,16 @@ private class RecordTypeMetadata_Tests {
         // One negative to confirm that the strings in our map are case sensitive
         System.assert(untypedRecordTypeMetadata.containsKey('APINAME') == false);
         // Now for the 'real' tests
-        System.assert(untypedRecordTypeMetadata.containsKey('apiName'));
-        System.assert(untypedRecordTypeMetadata.containsKey('businessProcessId'));
-        System.assert(untypedRecordTypeMetadata.containsKey('description'));
-        System.assert(untypedRecordTypeMetadata.containsKey('id'));
-        System.assert(untypedRecordTypeMetadata.containsKey('isActive'));
-        System.assert(untypedRecordTypeMetadata.containsKey('isAvailable'));
-        System.assert(untypedRecordTypeMetadata.containsKey('isDefault'));
-        System.assert(untypedRecordTypeMetadata.containsKey('isMaster'));
-        System.assert(untypedRecordTypeMetadata.containsKey('label'));
-        System.assert(untypedRecordTypeMetadata.containsKey('localApiName'));
-        System.assert(untypedRecordTypeMetadata.containsKey('namespace'));
-        System.assert(untypedRecordTypeMetadata.containsKey('sobjectApiName'));
+        System.assert(untypedRecordTypeMetadata.containsKey('ApiName'));
+        System.assert(untypedRecordTypeMetadata.containsKey('Id'));
+        System.assert(untypedRecordTypeMetadata.containsKey('IsActive'));
+        System.assert(untypedRecordTypeMetadata.containsKey('IsAvailable'));
+        System.assert(untypedRecordTypeMetadata.containsKey('IsDefault'));
+        System.assert(untypedRecordTypeMetadata.containsKey('IsMaster'));
+        System.assert(untypedRecordTypeMetadata.containsKey('Label'));
+        System.assert(untypedRecordTypeMetadata.containsKey('LocalApiName'));
+        System.assert(untypedRecordTypeMetadata.containsKey('Namespace'));
+        System.assert(untypedRecordTypeMetadata.containsKey('SobjectApiName'));
     }
 
 }
\ No newline at end of file
diff --git a/src/classes/RecordTypeMetadata_Tests.cls-meta.xml b/src/classes/RecordTypeMetadata_Tests.cls-meta.xml
index f3bac1f..800e53c 100644
--- a/src/classes/RecordTypeMetadata_Tests.cls-meta.xml
+++ b/src/classes/RecordTypeMetadata_Tests.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>41.0</apiVersion>
+    <apiVersion>43.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/src/classes/SObjectMetadata.cls b/src/classes/SObjectMetadata.cls
deleted file mode 100644
index 83990dd..0000000
--- a/src/classes/SObjectMetadata.cls
+++ /dev/null
@@ -1,147 +0,0 @@
-/*************************************************************************************************
-* This file is part of the SimpleMetadata project, released under the MIT License.               *
-* See LICENSE file or go to https://github.com/jongpie/SimpleMetadata for full license details.  *
-*************************************************************************************************/
-global virtual class SObjectMetadata {
-
-    @AuraEnabled global final String apiName                  {get; private set;}
-    @AuraEnabled global final String displayFieldApiName      {get; private set;}
-    @AuraEnabled global final Boolean hasMultiCurrency        {get; private set;}
-    @AuraEnabled global final Boolean hasSubtypes             {get; private set;}
-    @AuraEnabled global final Boolean isAccessible            {get; private set;}
-    @AuraEnabled global final Boolean isChatterFeedEnabled    {get; private set;}
-    @AuraEnabled global final Boolean isCreateable            {get; private set;}
-    @AuraEnabled global final Boolean isCustom                {get; private set;}
-    @AuraEnabled global final Boolean isCustomSetting         {get; private set;}
-    @AuraEnabled global final Boolean isDeletable             {get; private set;}
-    @AuraEnabled global final Boolean isMruEnabled            {get; private set;}
-    @AuraEnabled global final Boolean isMergeable             {get; private set;}
-    @AuraEnabled global final Boolean isQueryable             {get; private set;}
-    @AuraEnabled global final Boolean isSearchable            {get; private set;}
-    @AuraEnabled global final Boolean isUndeletable           {get; private set;}
-    @AuraEnabled global final Boolean isUpdateable            {get; private set;}
-    @AuraEnabled global final List<String> fieldApiNames      {get; private set;}
-    @AuraEnabled global final List<String> fieldSetApiNames   {get; private set;}
-    @AuraEnabled global final String keyPrefix                {get; private set;}
-    @AuraEnabled global final String label                    {get; private set;}
-    @AuraEnabled global final String labelPlural              {get; private set;}
-    @AuraEnabled global final List<String> listViewApiNames   {get; private set;}
-    @AuraEnabled global final String localApiName             {get; private set;}
-    @AuraEnabled global final String namespace                {get; private set;}
-    @AuraEnabled global final List<String> recordTypeApiNames {get; private set;}
-    @AuraEnabled global final String tabIcon                  {get; private set;}
-
-    global SObjectMetadata(String sobjectApiName) {
-        this(Schema.getGlobalDescribe().get(sobjectApiName));
-    }
-
-    global SObjectMetadata(Schema.SObjectType sobjectType) {
-        DescribeSObjectResult sobjectDescribe = sobjectType.getDescribe();
-
-        this.apiName              = String.valueOf(sobjectType);
-        this.displayFieldApiName  = this.getDisplayFieldApiName(sobjectDescribe);
-        this.fieldApiNames        = this.getFieldApiNames(sobjectDescribe);
-        this.fieldSetApiNames     = this.getFieldSetApiNames(sobjectDescribe);
-        this.hasMultiCurrency     = sobjectDescribe.fields.getMap().containsKey('CurrencyIsoCode');
-        this.hasSubtypes          = sobjectDescribe.getHasSubtypes();
-        this.isAccessible         = sobjectDescribe.isAccessible();
-        this.isChatterFeedEnabled = sobjectDescribe.isFeedEnabled();
-        this.isCreateable         = sobjectDescribe.isCreateable();
-        this.isCustom             = sobjectDescribe.isCustom();
-        this.isCustomSetting      = sobjectDescribe.isCustomSetting();
-        this.isDeletable          = sobjectDescribe.isDeletable();
-        this.isMergeable          = sobjectDescribe.isMergeable();
-        this.isMruEnabled         = sobjectDescribe.isMruEnabled();
-        this.isQueryable          = sobjectDescribe.isQueryable();
-        this.isSearchable         = sobjectDescribe.isSearchable();
-        this.isUndeletable        = sobjectDescribe.isUndeletable();
-        this.isUpdateable         = sobjectDescribe.isUpdateable();
-        this.keyPrefix            = sobjectDescribe.getKeyPrefix();
-        this.label                = sobjectDescribe.getLabel();
-        this.labelPlural          = sobjectDescribe.getLabelPlural();
-        this.listViewApiNames     = ListViewMetadata.getListViewApiNames(String.valueOf(sobjectType));
-        this.localApiName         = sobjectDescribe.getLocalName();
-        this.namespace            = this.getNamespace();
-        this.recordTypeApiNames   = RecordTypeMetadata.getRecordTypeApiNames(String.valueOf(sobjectType));
-        this.tabIcon              = this.getTabIcon();
-    }
-
-    private String getDisplayFieldApiName(Schema.DescribeSObjectResult sobjectDescribe) {
-        // There are several commonly used names for the display field name - typically, Name
-        // Check the common names first before resorting to looping through all SObject fields
-        // The order of the field names has been sorted based on number of objects in a dev org with that field
-        List<String> educatedGuesses = new List<String>{
-            'Name', 'DeveloperName', 'ApiName', 'Title', 'Subject',
-            'AssetRelationshipNumber', 'CaseNumber', 'ContractNumber',
-            'Domain', 'FriendlyName', 'FunctionName', 'Label', 'LocalPart',
-            'OrderItemNumber', 'OrderNumber', 'SolutionName', 'TestSuiteName'
-        };
-        for(String fieldName : educatedGuesses) {
-            Schema.SObjectField field = sobjectDescribe.fields.getMap().get(fieldName);
-
-            if(field == null) continue;
-
-            Schema.DescribeFieldResult fieldDescribe = field.getDescribe();
-
-            if(fieldDescribe.isNameField()) return fieldDescribe.getName();
-        }
-
-        // If we still don't have the displayFieldName, then loop through all fields to find it
-        for(Schema.SObjectField field : sobjectDescribe.fields.getMap().values()) {
-            Schema.DescribeFieldResult fieldDescribe = field.getDescribe();
-
-            if(fieldDescribe.isNameField()) return fieldDescribe.getName();
-        }
-
-        return null;
-    }
-
-    private List<String> getFieldApiNames(Schema.DescribeSObjectResult sobjectDescribe) {
-        List<String> fieldApiNames = new List<String>();
-        for(Schema.SObjectField field : sobjectDescribe.fields.getMap().values()) {
-            fieldApiNames.add(String.valueOf(field));
-        }
-        fieldApiNames.sort();
-        return fieldApiNames;
-    }
-
-    private List<String> getFieldSetApiNames(Schema.DescribeSObjectResult sobjectDescribe) {
-        List<String> fieldSetApiNames = new List<String>();
-        for(Schema.FieldSet fieldSet : sobjectDescribe.fieldSets.getMap().values()) {
-            String namespace = fieldSet.getNameSpace() == null ? '' : FieldSet.getNamespace() + '__';
-            fieldSetApiNames.add(namespace + fieldSet.getName());
-        }
-        fieldSetApiNames.sort();
-        return fieldSetApiNames;
-    }
-
-    private String getNamespace() {
-        Integer localNameIndex = this.apiName.replace('__c', '').indexOf('__');
-        return localNameIndex < 0 ? null : this.apiName.substring(0, localNameIndex);
-    }
-
-    private String getTabIcon() {
-        String tabIcon;
-        for(Schema.DescribeTabSetResult tabSetResult : Schema.describeTabs()) {
-            for(Schema.DescribeTabResult tabResult : tabSetResult.getTabs()) {
-                if(tabResult.getSObjectName() != this.apiName) continue;
-
-                String iconType = tabResult.isCustom() ? 'custom' : 'standard';
-                String svgIconName;
-                for(Schema.DescribeIconResult icon : tabResult.getIcons()) {
-                    if(icon.getContentType() != 'image/svg+xml') continue;
-
-                    svgIconName = icon.getUrl().substringAfterLast('/').replace('.svg', '');
-                    tabIcon = iconType + ':' + svgIconName;
-                    break;
-                }
-            }
-        }
-        // Hardcoded exceptions - Salesforce doesn't return SVGs for these objects, so hardcoding is necessary
-        if(tabIcon == null && this.apiName == 'Asset') tabIcon = 'standard:maintenance_asset';
-        if(tabIcon == null && this.apiName == 'AssetRelationship') tabIcon = 'standard:asset_relationship';
-
-        return tabIcon;
-    }
-
-}
\ No newline at end of file
diff --git a/src/classes/SObjectMetadata_Tests.cls b/src/classes/SObjectMetadata_Tests.cls
deleted file mode 100644
index 1617891..0000000
--- a/src/classes/SObjectMetadata_Tests.cls
+++ /dev/null
@@ -1,108 +0,0 @@
-/*************************************************************************************************
-* This file is part of the SimpleMetadata project, released under the MIT License.               *
-* See LICENSE file or go to https://github.com/jongpie/SimpleMetadata for full license details.  *
-*************************************************************************************************/
-@isTest
-private class SObjectMetadata_Tests {
-
-    @isTest
-    static void it_should_return_metadata_for_account_sobject_token() {
-        SObjectMetadata accountMetadata = new SObjectMetadata(Schema.Account.SObjectType);
-        validateAttributesAreSet(accountMetadata);
-        validateCaseSentivityForJavascript(accountMetadata);
-    }
-
-    @isTest
-    static void it_should_return_metadata_for_account_sobject_api_name() {
-        SObjectMetadata accountMetadata = new SObjectMetadata('Account');
-        validateAttributesAreSet(accountMetadata);
-        validateCaseSentivityForJavascript(accountMetadata);
-    }
-
-    private static void validateAttributesAreSet(SObjectMetadata sobjectMetadata) {
-        Schema.DescribeSObjectResult accountDescribe = Schema.Account.SObjectType.getDescribe();
-
-        System.assertEquals('Account', sobjectMetadata.apiName);
-        System.assertEquals('Name', sobjectMetadata.displayFieldApiName);
-        System.assertEquals(accountDescribe.fields.getMap().size(), sobjectMetadata.fieldApiNames.size());
-        System.assertEquals(accountDescribe.getHasSubtypes(), sobjectMetadata.hasSubtypes);
-        System.assertEquals(accountDescribe.isAccessible(), sobjectMetadata.isAccessible);
-        System.assertEquals(accountDescribe.isFeedEnabled(), sobjectMetadata.isChatterFeedEnabled);
-        System.assertEquals(accountDescribe.isCreateable(), sobjectMetadata.isCreateable);
-        System.assertEquals(accountDescribe.isCustom(), sobjectMetadata.isCustom);
-        System.assertEquals(accountDescribe.isCustomSetting(), sobjectMetadata.isCustomSetting);
-        System.assertEquals(accountDescribe.isDeletable(), sobjectMetadata.isDeletable);
-        System.assertEquals(accountDescribe.isMergeable(), sobjectMetadata.isMergeable);
-        System.assertEquals(accountDescribe.isMruEnabled(), sobjectMetadata.isMRUEnabled);
-        System.assertEquals(accountDescribe.isQueryable(), sobjectMetadata.isQueryable);
-        System.assertEquals(accountDescribe.isSearchable(), sobjectMetadata.isSearchable);
-        System.assertEquals(accountDescribe.isUndeletable(), sobjectMetadata.isUndeletable);
-        System.assertEquals(accountDescribe.isUpdateable(), sobjectMetadata.isUpdateable);
-        System.assertEquals(accountDescribe.getKeyPrefix(), sobjectMetadata.keyPrefix);
-        System.assertEquals(accountDescribe.getLabel(), sobjectMetadata.label);
-        System.assertEquals(accountDescribe.getLabelPlural(), sobjectMetadata.labelPlural);
-        System.assertEquals(accountDescribe.getLocalName(), sobjectMetadata.localApiName);
-        System.assertEquals('standard:account', sobjectMetadata.tabIcon);
-
-        System.assertNotEquals(null, sobjectMetadata.apiName);
-        System.assertNotEquals(null, sobjectMetadata.displayFieldApiName);
-        System.assertNotEquals(null, sobjectMetadata.hasMultiCurrency);
-        System.assertNotEquals(null, sobjectMetadata.hasSubtypes);
-        System.assertNotEquals(null, sobjectMetadata.isAccessible);
-        System.assertNotEquals(null, sobjectMetadata.isChatterFeedEnabled);
-        System.assertNotEquals(null, sobjectMetadata.isCreateable);
-        System.assertNotEquals(null, sobjectMetadata.isCustom);
-        System.assertNotEquals(null, sobjectMetadata.isCustomSetting);
-        System.assertNotEquals(null, sobjectMetadata.isDeletable);
-        System.assertNotEquals(null, sobjectMetadata.isMruEnabled);
-        System.assertNotEquals(null, sobjectMetadata.isMergeable);
-        System.assertNotEquals(null, sobjectMetadata.isQueryable);
-        System.assertNotEquals(null, sobjectMetadata.isSearchable);
-        System.assertNotEquals(null, sobjectMetadata.isUndeletable);
-        System.assertNotEquals(null, sobjectMetadata.isUpdateable);
-        System.assertNotEquals(null, sobjectMetadata.fieldApiNames);
-        System.assertNotEquals(null, sobjectMetadata.fieldSetApiNames);
-        System.assertNotEquals(null, sobjectMetadata.keyPrefix);
-        System.assertNotEquals(null, sobjectMetadata.label);
-        System.assertNotEquals(null, sobjectMetadata.labelPlural);
-        System.assertNotEquals(null, sobjectMetadata.localApiName);
-        System.assertNotEquals(null, sobjectMetadata.tabIcon);
-    }
-
-    private static void validateCaseSentivityForJavascript(SObjectMetadata sobjectMetadata) {
-        // Validate that the attributes are named exactly as expected so that javascript can rely on them
-        String jsonSObjectMetadata = JSON.serialize(sobjectMetadata);
-        Map<String, Object> untypedSObjectMetadata = (Map<String, Object>)JSON.deserializeUntyped(jsonSObjectMetadata);
-
-        // One negative to confirm that the strings in our map are case sensitive
-        System.assert(untypedSObjectMetadata.containsKey('APINAME') == false);
-        // Now for the 'real' tests
-        System.assert(untypedSObjectMetadata.containsKey('apiName'));
-        System.assert(untypedSObjectMetadata.containsKey('displayFieldApiName'));
-        System.assert(untypedSObjectMetadata.containsKey('hasMultiCurrency'));
-        System.assert(untypedSObjectMetadata.containsKey('hasSubtypes'));
-        System.assert(untypedSObjectMetadata.containsKey('isAccessible'));
-        System.assert(untypedSObjectMetadata.containsKey('isChatterFeedEnabled'));
-        System.assert(untypedSObjectMetadata.containsKey('isCreateable'));
-        System.assert(untypedSObjectMetadata.containsKey('isCustom'));
-        System.assert(untypedSObjectMetadata.containsKey('isCustomSetting'));
-        System.assert(untypedSObjectMetadata.containsKey('isDeletable'));
-        System.assert(untypedSObjectMetadata.containsKey('isMruEnabled'));
-        System.assert(untypedSObjectMetadata.containsKey('isMergeable'));
-        System.assert(untypedSObjectMetadata.containsKey('isQueryable'));
-        System.assert(untypedSObjectMetadata.containsKey('isSearchable'));
-        System.assert(untypedSObjectMetadata.containsKey('isUndeletable'));
-        System.assert(untypedSObjectMetadata.containsKey('isUpdateable'));
-        System.assert(untypedSObjectMetadata.containsKey('fieldApiNames'));
-        System.assert(untypedSObjectMetadata.containsKey('fieldSetApiNames'));
-        System.assert(untypedSObjectMetadata.containsKey('keyPrefix'));
-        System.assert(untypedSObjectMetadata.containsKey('label'));
-        System.assert(untypedSObjectMetadata.containsKey('labelPlural'));
-        System.assert(untypedSObjectMetadata.containsKey('listViewApiNames'));
-        System.assert(untypedSObjectMetadata.containsKey('localApiName'));
-        System.assert(untypedSObjectMetadata.containsKey('namespace'));
-        System.assert(untypedSObjectMetadata.containsKey('recordTypeApiNames'));
-        System.assert(untypedSObjectMetadata.containsKey('tabIcon'));
-    }
-
-}
\ No newline at end of file
diff --git a/src/classes/SobjectMetadata.cls b/src/classes/SobjectMetadata.cls
new file mode 100644
index 0000000..ec9a781
--- /dev/null
+++ b/src/classes/SobjectMetadata.cls
@@ -0,0 +1,191 @@
+/*************************************************************************************************
+* This file is part of the SimpleMetadata project, released under the MIT License.               *
+* See LICENSE file or go to https://github.com/jongpie/SimpleMetadata for full license details.  *
+*************************************************************************************************/
+global class SobjectMetadata {
+
+    @AuraEnabled global final String ApiName                                     {get; private set;}
+    @AuraEnabled global final List<ChildRelationshipMetadata> ChildRelationships {get; private set;}
+    @AuraEnabled global final String DisplayFieldApiName                         {get; private set;}
+    @AuraEnabled global final List<String> FieldApiNames                         {get; private set;}
+    @AuraEnabled global final List<String> FieldSetApiNames                      {get; private set;}
+    @AuraEnabled global final Boolean HasMultiCurrency                           {get; private set;}
+    @AuraEnabled global final Boolean HasSubtypes                                {get; private set;}
+    @AuraEnabled global final Boolean IsAccessible                               {get; private set;}
+    @AuraEnabled global final Boolean IsChatterFeedEnabled                       {get; private set;}
+    @AuraEnabled global final Boolean IsCreateable                               {get; private set;}
+    @AuraEnabled global final Boolean IsCustom                                   {get; private set;}
+    @AuraEnabled global final Boolean IsCustomSetting                            {get; private set;}
+    @AuraEnabled global final Boolean IsDeletable                                {get; private set;}
+    @AuraEnabled global final Boolean IsMruEnabled                               {get; private set;}
+    @AuraEnabled global final Boolean IsMergeable                                {get; private set;}
+    @AuraEnabled global final Boolean IsQueryable                                {get; private set;}
+    @AuraEnabled global final Boolean IsSearchable                               {get; private set;}
+    @AuraEnabled global final Boolean IsUndeletable                              {get; private set;}
+    @AuraEnabled global final Boolean IsUpdateable                               {get; private set;}
+    @AuraEnabled global final String KeyPrefix                                   {get; private set;}
+    @AuraEnabled global final String Label                                       {get; private set;}
+    @AuraEnabled global final String LabelPlural                                 {get; private set;}
+    @AuraEnabled global final String LocalApiName                                {get; private set;}
+    @AuraEnabled global final String Namespace                                   {get; private set;}
+    @AuraEnabled global final List<RecordTypeMetadata> RecordTypes               {get; private set;}
+    @AuraEnabled global final String TabIcon                                     {get; private set;}
+
+    global SobjectMetadata(String sobjectApiName) {
+        this(Schema.getGlobalDescribe().get(sobjectApiName));
+    }
+
+    global SobjectMetadata(Schema.SobjectType sobjectType) {
+        DescribeSobjectResult sobjectDescribe = sobjectType.getDescribe();
+
+        this.ApiName              = String.valueOf(sobjectType);
+        this.ChildRelationships   = this.getChildRelationships(sobjectDescribe.getChildRelationships());
+        this.DisplayFieldApiName  = this.getDisplayFieldApiName(sobjectDescribe);
+        this.FieldApiNames        = this.getFieldApiNames(sobjectDescribe);
+        this.FieldSetApiNames     = this.getFieldSetApiNames(sobjectDescribe);
+        this.HasMultiCurrency     = sobjectDescribe.fields.getMap().containsKey('CurrencyIsoCode');
+        this.HasSubtypes          = sobjectDescribe.getHasSubtypes();
+        this.IsAccessible         = sobjectDescribe.isAccessible();
+        this.IsChatterFeedEnabled = sobjectDescribe.isFeedEnabled();
+        this.IsCreateable         = sobjectDescribe.isCreateable();
+        this.IsCustom             = sobjectDescribe.isCustom();
+        this.IsCustomSetting      = sobjectDescribe.isCustomSetting();
+        this.IsDeletable          = sobjectDescribe.isDeletable();
+        this.IsMergeable          = sobjectDescribe.isMergeable();
+        this.IsMruEnabled         = sobjectDescribe.isMruEnabled();
+        this.IsQueryable          = sobjectDescribe.isQueryable();
+        this.IsSearchable         = sobjectDescribe.isSearchable();
+        this.IsUndeletable        = sobjectDescribe.isUndeletable();
+        this.IsUpdateable         = sobjectDescribe.isUpdateable();
+        this.KeyPrefix            = sobjectDescribe.getKeyPrefix();
+        this.Label                = sobjectDescribe.getLabel();
+        this.LabelPlural          = sobjectDescribe.getLabelPlural();
+        this.LocalApiName         = sobjectDescribe.getLocalName();
+        this.Namespace            = this.getNamespace();
+        this.RecordTypes          = this.getRecordTypes(sobjectType, sobjectDescribe.getRecordTypeInfos());
+        this.TabIcon              = this.getTabIcon();
+    }
+
+    private List<ChildRelationshipMetadata> getChildRelationships(List<Schema.ChildRelationship> relationships) {
+        List<ChildRelationshipMetadata> childRelationships = new List<ChildRelationshipMetadata>();
+        for(Schema.ChildRelationship relationship : relationships) {
+            childRelationships.add(new ChildRelationshipMetadata(relationship));
+        }
+        childRelationships.sort();
+        return childRelationships;
+    }
+
+    private String getDisplayFieldApiName(Schema.DescribeSobjectResult sobjectDescribe) {
+        // There are several commonly used names for the display field name - typically, Name
+        // Check the common names first before resorting to looping through all Sobject fields
+        // The order of the field names has been sorted based on number of objects in a dev org with that field
+        List<String> educatedGuesses = new List<String>{
+            'Name', 'DeveloperName', 'ApiName', 'Title', 'Subject',
+            'AssetRelationshipNumber', 'CaseNumber', 'ContractNumber',
+            'Domain', 'FriendlyName', 'FunctionName', 'Label', 'LocalPart',
+            'OrderItemNumber', 'OrderNumber', 'SolutionName', 'TestSuiteName'
+        };
+        for(String fieldName : educatedGuesses) {
+            Schema.SobjectField field = sobjectDescribe.fields.getMap().get(fieldName);
+
+            if(field == null) continue;
+
+            Schema.DescribeFieldResult fieldDescribe = field.getDescribe();
+
+            if(fieldDescribe.isNameField()) return fieldDescribe.getName();
+        }
+
+        return null;
+    }
+
+    private List<String> getFieldApiNames(Schema.DescribeSobjectResult sobjectDescribe) {
+        List<String> fieldApiNames = new List<String>();
+        for(Schema.SobjectField field : sobjectDescribe.fields.getMap().values()) {
+            fieldApiNames.add(String.valueOf(field));
+        }
+        fieldApiNames.sort();
+        return fieldApiNames;
+    }
+
+    private List<String> getFieldSetApiNames(Schema.DescribeSobjectResult sobjectDescribe) {
+        List<String> fieldSetApiNames = new List<String>();
+        for(Schema.FieldSet fieldSet : sobjectDescribe.fieldSets.getMap().values()) {
+            String namespace = fieldSet.getNameSpace() == null ? '' : FieldSet.getNamespace() + '__';
+            fieldSetApiNames.add(namespace + fieldSet.getName());
+        }
+        fieldSetApiNames.sort();
+        return fieldSetApiNames;
+    }
+
+    private String getNamespace() {
+        Integer localNameIndex = this.ApiName.replace('__c', '').indexOf('__');
+        return localNameIndex < 0 ? null : this.ApiName.substring(0, localNameIndex);
+    }
+
+    private List<RecordTypeMetadata> getRecordTypes(Schema.SobjectType sobjectType, List<Schema.RecordTypeInfo> recordTypeInfos) {
+        List<RecordTypeMetadata> recordTypes = new List<RecordTypeMetadata>();
+        for(Schema.RecordTypeInfo recordTypeInfo : recordTypeInfos) {
+            recordTypes.add(new RecordTypeMetadata(sobjectType, recordTypeInfo));
+        }
+        recordTypes.sort();
+        return recordTypes;
+    }
+
+    private String getTabIcon() {
+        String tabIcon;
+        for(Schema.DescribeTabSetResult tabSetResult : Schema.describeTabs()) {
+            if(tabIcon != null) break;
+
+            for(Schema.DescribeTabResult tabResult : tabSetResult.getTabs()) {
+                if(tabIcon != null) break;
+                if(tabResult.getSobjectName() != this.ApiName) continue;
+
+                String iconType = tabResult.isCustom() ? 'custom' : 'standard';
+                String svgIconName;
+                for(Schema.DescribeIconResult icon : tabResult.getIcons()) {
+                    if(icon.getContentType() != 'image/svg+xml') continue;
+
+                    svgIconName = icon.getUrl().substringAfterLast('/').replace('.svg', '');
+                    tabIcon = iconType + ':' + svgIconName;
+                    break;
+                }
+            }
+        }
+        // Hardcoded exceptions - Salesforce doesn't return SVGs for these objects, so hardcoding is necessary
+        if(tabIcon == null && this.ApiName == 'Asset') tabIcon = 'standard:maintenance_asset';
+        if(tabIcon == null && this.ApiName == 'AssetRelationship') tabIcon = 'standard:asset_relationship';
+
+        return tabIcon;
+    }
+
+    global class ChildRelationshipMetadata implements Comparable {
+
+        @AuraEnabled global String ChildSobjectApiName      {get; private set;}
+        @AuraEnabled global String FieldApiName             {get; private set;}
+        @AuraEnabled global String FieldRelationshipApiName {get; private set;}
+        @AuraEnabled global Boolean IsCascadeDelete         {get; private set;}
+        @AuraEnabled global Boolean IsRestrictedDelete      {get; private set;}
+        @AuraEnabled global String RelationshipApiName      {get; private set;}
+
+        global ChildRelationshipMetadata(Schema.ChildRelationship childRelationship) {
+            this.ChildSobjectApiName      = String.valueOf(childRelationship.getChildSobject());
+            this.FieldApiName             = String.valueOf(childRelationship.getField());
+            this.FieldRelationshipApiName = childRelationship.getField().getDescribe().getRelationshipName();
+            this.IsCascadeDelete          = childRelationship.isCascadeDelete();
+            this.IsRestrictedDelete       = childRelationship.isRestrictedDelete();
+            this.RelationshipApiName      = childRelationship.getRelationshipName();
+        }
+
+        global Integer compareTo(Object compareTo) {
+            ChildRelationshipMetadata compareToChildRelationship = (ChildRelationshipMetadata)compareTo;
+            String key          = this.ChildSobjectApiName + this.FieldApiName;
+            String compareToKey = compareToChildRelationship.ChildSobjectApiName + compareToChildRelationship.FieldApiName;
+
+            if(key == compareToKey) return 0;
+            else if(key > compareToKey) return 1;
+            else return -1;
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/src/classes/SobjectMetadata.cls-meta.xml b/src/classes/SobjectMetadata.cls-meta.xml
new file mode 100644
index 0000000..800e53c
--- /dev/null
+++ b/src/classes/SobjectMetadata.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>43.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/src/classes/SobjectMetadata_Tests.cls b/src/classes/SobjectMetadata_Tests.cls
new file mode 100644
index 0000000..85dd46a
--- /dev/null
+++ b/src/classes/SobjectMetadata_Tests.cls
@@ -0,0 +1,112 @@
+/*************************************************************************************************
+* This file is part of the SimpleMetadata project, released under the MIT License.               *
+* See LICENSE file or go to https://github.com/jongpie/SimpleMetadata for full license details.  *
+*************************************************************************************************/
+@isTest
+private class SobjectMetadata_Tests {
+
+    @isTest
+    static void it_should_return_metadata_for_account_sobject_token() {
+        SobjectMetadata accountMetadata = new SobjectMetadata(Schema.Account.SobjectType);
+        validateAttributesAreSet(accountMetadata);
+        validateCaseSentivityForJavascript(accountMetadata);
+    }
+
+    @isTest
+    static void it_should_return_metadata_for_account_sobject_api_name() {
+        SobjectMetadata accountMetadata = new SobjectMetadata('Account');
+        validateAttributesAreSet(accountMetadata);
+        validateCaseSentivityForJavascript(accountMetadata);
+    }
+
+    private static void validateAttributesAreSet(SobjectMetadata sobjectMetadata) {
+        Schema.DescribeSobjectResult accountDescribe = Schema.Account.SobjectType.getDescribe();
+
+        System.assertEquals('Account', sobjectMetadata.ApiName);
+        System.assertEquals('Name', sobjectMetadata.DisplayFieldApiName);
+        System.assertEquals(accountDescribe.getChildRelationships().size(), sobjectMetadata.ChildRelationships.size());
+        System.assertEquals(accountDescribe.fields.getMap().size(), sobjectMetadata.FieldApiNames.size());
+        System.assertEquals(accountDescribe.getHasSubtypes(), sobjectMetadata.HasSubtypes);
+        System.assertEquals(accountDescribe.isAccessible(), sobjectMetadata.IsAccessible);
+        System.assertEquals(accountDescribe.isFeedEnabled(), sobjectMetadata.IsChatterFeedEnabled);
+        System.assertEquals(accountDescribe.isCreateable(), sobjectMetadata.IsCreateable);
+        System.assertEquals(accountDescribe.isCustom(), sobjectMetadata.IsCustom);
+        System.assertEquals(accountDescribe.isCustomSetting(), sobjectMetadata.IsCustomSetting);
+        System.assertEquals(accountDescribe.isDeletable(), sobjectMetadata.IsDeletable);
+        System.assertEquals(accountDescribe.isMergeable(), sobjectMetadata.IsMergeable);
+        System.assertEquals(accountDescribe.isMruEnabled(), sobjectMetadata.IsMRUEnabled);
+        System.assertEquals(accountDescribe.isQueryable(), sobjectMetadata.IsQueryable);
+        System.assertEquals(accountDescribe.isSearchable(), sobjectMetadata.IsSearchable);
+        System.assertEquals(accountDescribe.isUndeletable(), sobjectMetadata.IsUndeletable);
+        System.assertEquals(accountDescribe.isUpdateable(), sobjectMetadata.IsUpdateable);
+        System.assertEquals(accountDescribe.getKeyPrefix(), sobjectMetadata.KeyPrefix);
+        System.assertEquals(accountDescribe.getLabel(), sobjectMetadata.Label);
+        System.assertEquals(accountDescribe.getLabelPlural(), sobjectMetadata.LabelPlural);
+        System.assertEquals(accountDescribe.getLocalName(), sobjectMetadata.LocalApiName);
+        System.assertEquals(accountDescribe.getRecordTypeInfos().size(), sobjectMetadata.RecordTypes.size());
+        System.assertEquals('standard:account', sobjectMetadata.TabIcon);
+
+        System.assertNotEquals(null, sobjectMetadata.ApiName);
+        System.assertNotEquals(null, sobjectMetadata.ChildRelationships);
+        System.assertNotEquals(null, sobjectMetadata.DisplayFieldApiName);
+        System.assertNotEquals(null, sobjectMetadata.HasMultiCurrency);
+        System.assertNotEquals(null, sobjectMetadata.HasSubtypes);
+        System.assertNotEquals(null, sobjectMetadata.IsAccessible);
+        System.assertNotEquals(null, sobjectMetadata.IsChatterFeedEnabled);
+        System.assertNotEquals(null, sobjectMetadata.IsCreateable);
+        System.assertNotEquals(null, sobjectMetadata.IsCustom);
+        System.assertNotEquals(null, sobjectMetadata.IsCustomSetting);
+        System.assertNotEquals(null, sobjectMetadata.IsDeletable);
+        System.assertNotEquals(null, sobjectMetadata.IsMruEnabled);
+        System.assertNotEquals(null, sobjectMetadata.IsMergeable);
+        System.assertNotEquals(null, sobjectMetadata.IsQueryable);
+        System.assertNotEquals(null, sobjectMetadata.IsSearchable);
+        System.assertNotEquals(null, sobjectMetadata.IsUndeletable);
+        System.assertNotEquals(null, sobjectMetadata.IsUpdateable);
+        System.assertNotEquals(null, sobjectMetadata.FieldApiNames);
+        System.assertNotEquals(null, sobjectMetadata.FieldSetApiNames);
+        System.assertNotEquals(null, sobjectMetadata.KeyPrefix);
+        System.assertNotEquals(null, sobjectMetadata.Label);
+        System.assertNotEquals(null, sobjectMetadata.LabelPlural);
+        System.assertNotEquals(null, sobjectMetadata.LocalApiName);
+        System.assertNotEquals(null, sobjectMetadata.RecordTypes);
+        System.assertNotEquals(null, sobjectMetadata.TabIcon);
+    }
+
+    private static void validateCaseSentivityForJavascript(SobjectMetadata sobjectMetadata) {
+        // Validate that the attributes are named exactly as expected so that javascript can rely on them
+        String jsonSobjectMetadata = JSON.serialize(sobjectMetadata);
+        Map<String, Object> untypedSobjectMetadata = (Map<String, Object>)JSON.deserializeUntyped(jsonSobjectMetadata);
+
+        // One negative to confirm that the strings in our map are case sensitive
+        System.assert(untypedSobjectMetadata.containsKey('APINAME') == false);
+        // Now for the 'real' tests
+        System.assert(untypedSobjectMetadata.containsKey('ApiName'));
+        System.assert(untypedSobjectMetadata.containsKey('ChildRelationships'));
+        System.assert(untypedSobjectMetadata.containsKey('DisplayFieldApiName'));
+        System.assert(untypedSobjectMetadata.containsKey('FieldApiNames'));
+        System.assert(untypedSobjectMetadata.containsKey('FieldSetApiNames'));
+        System.assert(untypedSobjectMetadata.containsKey('HasMultiCurrency'));
+        System.assert(untypedSobjectMetadata.containsKey('HasSubtypes'));
+        System.assert(untypedSobjectMetadata.containsKey('IsAccessible'));
+        System.assert(untypedSobjectMetadata.containsKey('IsChatterFeedEnabled'));
+        System.assert(untypedSobjectMetadata.containsKey('IsCreateable'));
+        System.assert(untypedSobjectMetadata.containsKey('IsCustom'));
+        System.assert(untypedSobjectMetadata.containsKey('IsCustomSetting'));
+        System.assert(untypedSobjectMetadata.containsKey('IsDeletable'));
+        System.assert(untypedSobjectMetadata.containsKey('IsMruEnabled'));
+        System.assert(untypedSobjectMetadata.containsKey('IsMergeable'));
+        System.assert(untypedSobjectMetadata.containsKey('IsQueryable'));
+        System.assert(untypedSobjectMetadata.containsKey('IsSearchable'));
+        System.assert(untypedSobjectMetadata.containsKey('IsUndeletable'));
+        System.assert(untypedSobjectMetadata.containsKey('IsUpdateable'));
+        System.assert(untypedSobjectMetadata.containsKey('KeyPrefix'));
+        System.assert(untypedSobjectMetadata.containsKey('Label'));
+        System.assert(untypedSobjectMetadata.containsKey('LabelPlural'));
+        System.assert(untypedSobjectMetadata.containsKey('LocalApiName'));
+        System.assert(untypedSobjectMetadata.containsKey('Namespace'));
+        System.assert(untypedSobjectMetadata.containsKey('RecordTypes'));
+        System.assert(untypedSobjectMetadata.containsKey('TabIcon'));
+    }
+
+}
\ No newline at end of file
diff --git a/src/classes/SobjectMetadata_Tests.cls-meta.xml b/src/classes/SobjectMetadata_Tests.cls-meta.xml
new file mode 100644
index 0000000..800e53c
--- /dev/null
+++ b/src/classes/SobjectMetadata_Tests.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>43.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/src/package.xml b/src/package.xml
index 3d1a76c..f6c6c35 100644
--- a/src/package.xml
+++ b/src/package.xml
@@ -8,5 +8,5 @@
         <members>*</members>
         <name>AuraDefinitionBundle</name>
     </types>
-    <version>42.0</version>
+    <version>43.0</version>
 </Package>