diff --git a/cores/arduino/mbed-bridge b/cores/arduino/mbed-bridge
index 63a8d6b3..42f0e69e 160000
--- a/cores/arduino/mbed-bridge
+++ b/cores/arduino/mbed-bridge
@@ -1 +1 @@
-Subproject commit 63a8d6b3d8f57999b7af867ceb93a6f7367ca12a
+Subproject commit 42f0e69e2eab69e98b62b9a97d9b7fd934c7ca4e
diff --git a/cores/mbed-os b/cores/mbed-os
index 90230bb7..5e7ff58f 160000
--- a/cores/mbed-os
+++ b/cores/mbed-os
@@ -1 +1 @@
-Subproject commit 90230bb74485d774d5dba5550297d2804724fb7e
+Subproject commit 5e7ff58f3294033b015ea12fdf1b098109b0549d
diff --git a/libraries/Apollo3/examples/Example1_DigitalWrite/Example1_DigitalWrite.ino b/libraries/Apollo3/examples/Example01_DigitalWrite/Example01_DigitalWrite.ino
similarity index 100%
rename from libraries/Apollo3/examples/Example1_DigitalWrite/Example1_DigitalWrite.ino
rename to libraries/Apollo3/examples/Example01_DigitalWrite/Example01_DigitalWrite.ino
diff --git a/libraries/Apollo3/examples/Example2_AnalogRead/Example2_AnalogRead.ino b/libraries/Apollo3/examples/Example02_AnalogRead/Example02_AnalogRead.ino
similarity index 100%
rename from libraries/Apollo3/examples/Example2_AnalogRead/Example2_AnalogRead.ino
rename to libraries/Apollo3/examples/Example02_AnalogRead/Example02_AnalogRead.ino
diff --git a/libraries/Apollo3/examples/Example3_AnalogWrite/Example3_AnalogWrite.ino b/libraries/Apollo3/examples/Example03_AnalogWrite/Example03_AnalogWrite.ino
similarity index 100%
rename from libraries/Apollo3/examples/Example3_AnalogWrite/Example3_AnalogWrite.ino
rename to libraries/Apollo3/examples/Example03_AnalogWrite/Example03_AnalogWrite.ino
diff --git a/libraries/Apollo3/examples/Example4_Serial/Example4_Serial.ino b/libraries/Apollo3/examples/Example04_Serial/Example04_Serial.ino
similarity index 100%
rename from libraries/Apollo3/examples/Example4_Serial/Example4_Serial.ino
rename to libraries/Apollo3/examples/Example04_Serial/Example04_Serial.ino
diff --git a/libraries/Apollo3/examples/Example5_Wire_I2C/Example5_Wire_I2C.ino b/libraries/Apollo3/examples/Example05_Wire_I2C/Example05_Wire_I2C.ino
similarity index 100%
rename from libraries/Apollo3/examples/Example5_Wire_I2C/Example5_Wire_I2C.ino
rename to libraries/Apollo3/examples/Example05_Wire_I2C/Example05_Wire_I2C.ino
diff --git a/libraries/Apollo3/examples/Example6_SPI/Example6_SPI.ino b/libraries/Apollo3/examples/Example06_SPI/Example06_SPI.ino
similarity index 100%
rename from libraries/Apollo3/examples/Example6_SPI/Example6_SPI.ino
rename to libraries/Apollo3/examples/Example06_SPI/Example06_SPI.ino
diff --git a/libraries/Apollo3/examples/Example7_Threads/Example7_Threads.ino b/libraries/Apollo3/examples/Example07_Threads/Example07_Threads.ino
similarity index 100%
rename from libraries/Apollo3/examples/Example7_Threads/Example7_Threads.ino
rename to libraries/Apollo3/examples/Example07_Threads/Example07_Threads.ino
diff --git a/libraries/Apollo3/examples/Example8_AttachInterrupt/Example8_AttachInterrupt.ino b/libraries/Apollo3/examples/Example08_AttachInterrupt/Example08_AttachInterrupt.ino
similarity index 100%
rename from libraries/Apollo3/examples/Example8_AttachInterrupt/Example8_AttachInterrupt.ino
rename to libraries/Apollo3/examples/Example08_AttachInterrupt/Example08_AttachInterrupt.ino
diff --git a/libraries/Apollo3/examples/Example9_DetachInterrupt/Example9_DetachInterrupt.ino b/libraries/Apollo3/examples/Example09_DetachInterrupt/Example09_DetachInterrupt.ino
similarity index 100%
rename from libraries/Apollo3/examples/Example9_DetachInterrupt/Example9_DetachInterrupt.ino
rename to libraries/Apollo3/examples/Example09_DetachInterrupt/Example09_DetachInterrupt.ino
diff --git a/libraries/SPI/src/SPI.h b/libraries/SPI/src/SPI.h
index 2f1c7c60..93693966 100644
--- a/libraries/SPI/src/SPI.h
+++ b/libraries/SPI/src/SPI.h
@@ -7,7 +7,7 @@
 #define _APOLLO3_LIBRARIES_SPI_H_
 
 #include "Arduino.h"
-
+#include "core-api/api/HardwareSPI.h"
 #include "drivers/SPI.h"
 
 namespace arduino {
diff --git a/libraries/Wire/src/Wire.cpp b/libraries/Wire/src/Wire.cpp
index 3168014c..9a20e1b2 100644
--- a/libraries/Wire/src/Wire.cpp
+++ b/libraries/Wire/src/Wire.cpp
@@ -66,7 +66,7 @@ uint8_t arduino::MbedI2C::endTransmission(bool stopBit) {
 	return 2;
 }
 
-uint8_t arduino::MbedI2C::requestFrom(uint8_t address, size_t len, bool stopBit) {
+size_t arduino::MbedI2C::requestFrom(uint8_t address, size_t len, bool stopBit) {
 	char buf[256];
 	int ret = master->read(address << 1, buf, len, !stopBit);
 	if (ret != 0) {
@@ -78,7 +78,7 @@ uint8_t arduino::MbedI2C::requestFrom(uint8_t address, size_t len, bool stopBit)
 	return len;
 }
 
-uint8_t arduino::MbedI2C::requestFrom(uint8_t address, size_t len) {
+size_t arduino::MbedI2C::requestFrom(uint8_t address, size_t len) {
 	return requestFrom(address, len, true);
 }
 
diff --git a/libraries/Wire/src/Wire.h b/libraries/Wire/src/Wire.h
index 881571c0..8c9041d5 100644
--- a/libraries/Wire/src/Wire.h
+++ b/libraries/Wire/src/Wire.h
@@ -7,6 +7,7 @@
 #define _APOLLO3_LIBRARIES_WIRE_H_
 
 #include "Arduino.h"
+#include "core-api/api/HardwareI2C.h"
 #include "drivers/I2C.h"
 #include "drivers/I2CSlave.h"
 #include "rtos.h"
@@ -32,8 +33,8 @@ class MbedI2C : public HardwareI2C
     virtual uint8_t endTransmission(bool stopBit);
     virtual uint8_t endTransmission(void);
 
-    virtual uint8_t requestFrom(uint8_t address, size_t len, bool stopBit);
-    virtual uint8_t requestFrom(uint8_t address, size_t len);
+    virtual size_t requestFrom(uint8_t address, size_t len, bool stopBit);
+    virtual size_t requestFrom(uint8_t address, size_t len);
 
     virtual void onReceive(void(*)(int));
     virtual void onRequest(void(*)(void));
diff --git a/package.json b/package.json
new file mode 100644
index 00000000..8af6c233
--- /dev/null
+++ b/package.json
@@ -0,0 +1,6 @@
+{
+    "name": "framework-arduinoapollo3",
+    "description": "An mbed-os enabled Arduino core for Ambiq Apollo3 based boards",
+    "version": "2.2.0",
+    "url": "https://github.com/sparkfun/Arduino_Apollo3"
+}
diff --git a/variants/LoRa_THING_PLUS_expLoRaBLE/mbed/.ld-symbols b/variants/LoRa_THING_PLUS_expLoRaBLE/mbed/.ld-symbols
index b9ed3813..535998c4 100644
--- a/variants/LoRa_THING_PLUS_expLoRaBLE/mbed/.ld-symbols
+++ b/variants/LoRa_THING_PLUS_expLoRaBLE/mbed/.ld-symbols
@@ -1 +1 @@
--DAM_CUSTOM_BDADDR -DAM_PACKAGE_BGA -DARDUINO_BLE_FIX -DARM_MATH_CM4 -DCOMPONENT_FLASHIAP=1 -DCORDIO_ZERO_COPY_HCI -DDEVICE_FLASH=1 -DDEVICE_I2C=1 -DDEVICE_INTERRUPTIN=1 -DDEVICE_LPTICKER=1 -DDEVICE_MPU=1 -DDEVICE_SERIAL=1 -DDEVICE_SPI=1 -DDEVICE_STDIO_MESSAGES=1 -DDEVICE_USTICKER=1 -DFEATURE_BLE=1 -DMBED_BUILD_TIMESTAMP=1625745529.6730196 -DTARGET_AMA3B1KK -DTARGET_Ambiq_Micro -DTARGET_Apollo3 -DTARGET_CORDIO -DTARGET_CORTEX -DTARGET_CORTEX_M -DTARGET_FAMILY_Apollo3 -DTARGET_LIKE_CORTEX_M4 -DTARGET_LIKE_MBED -DTARGET_LoRa_THING_PLUS_expLoRaBLE -DTARGET_M4 -DTARGET_NAME=LoRa_THING_PLUS_expLoRaBLE -DTARGET_RELEASE -DTARGET_RTOS_M4_M7 -DTOOLCHAIN_GCC -DTOOLCHAIN_GCC_ARM -D__CMSIS_RTOS -D__CORTEX_M4 -D__FPU_PRESENT=1 -D__MBED_CMSIS_RTOS_CM -D__MBED__=1 
\ No newline at end of file
+-DAM_CUSTOM_BDADDR -DAM_PACKAGE_BGA -DARDUINO_BLE_FIX -DARM_MATH_CM4 -DCOMPONENT_FLASHIAP=1 -DCORDIO_ZERO_COPY_HCI -DDEVICE_FLASH=1 -DDEVICE_I2C=1 -DDEVICE_INTERRUPTIN=1 -DDEVICE_LPTICKER=1 -DDEVICE_MPU=1 -DDEVICE_SERIAL=1 -DDEVICE_SPI=1 -DDEVICE_STDIO_MESSAGES=1 -DDEVICE_USTICKER=1 -DFEATURE_BLE=1 -DMBED_BUILD_TIMESTAMP=1639060156.7070057 -DTARGET_AMA3B1KK -DTARGET_Ambiq_Micro -DTARGET_Apollo3 -DTARGET_CORDIO -DTARGET_CORTEX -DTARGET_CORTEX_M -DTARGET_FAMILY_Apollo3 -DTARGET_LIKE_CORTEX_M4 -DTARGET_LIKE_MBED -DTARGET_LoRa_THING_PLUS_expLoRaBLE -DTARGET_M4 -DTARGET_NAME=LoRa_THING_PLUS_expLoRaBLE -DTARGET_RELEASE -DTARGET_RTOS_M4_M7 -DTOOLCHAIN_GCC -DTOOLCHAIN_GCC_ARM -D__CMSIS_RTOS -D__CORTEX_M4 -D__FPU_PRESENT=1 -D__MBED_CMSIS_RTOS_CM -D__MBED__=1 
\ No newline at end of file
diff --git a/variants/LoRa_THING_PLUS_expLoRaBLE/mbed/libmbed-os.a b/variants/LoRa_THING_PLUS_expLoRaBLE/mbed/libmbed-os.a
index ee705b57..385d95d1 100644
Binary files a/variants/LoRa_THING_PLUS_expLoRaBLE/mbed/libmbed-os.a and b/variants/LoRa_THING_PLUS_expLoRaBLE/mbed/libmbed-os.a differ
diff --git a/variants/LoRa_THING_PLUS_expLoRaBLE/variant.h b/variants/LoRa_THING_PLUS_expLoRaBLE/variant.h
index 9492cb40..585d4c1c 100644
--- a/variants/LoRa_THING_PLUS_expLoRaBLE/variant.h
+++ b/variants/LoRa_THING_PLUS_expLoRaBLE/variant.h
@@ -11,7 +11,7 @@
 #include "config/pins.h"
 
 #define VARIANT_SPI_INTFCS  2
-#define VARIANT_WIRE_INTFCS 1
+#define VARIANT_WIRE_INTFCS 2
 
 // SPI
 #define VARIANT_SPI_SDI     SPI_SDI
@@ -26,6 +26,8 @@
 // Wire
 #define VARIANT_Wire_SDA    I2C_SDA
 #define VARIANT_Wire_SCL    I2C_SCL
+#define VARIANT_Wire1_SDA 	I2C1_SDA
+#define VARIANT_Wire1_SCL 	I2C1_SCL
 
 // UART
 extern UART Serial1;
diff --git a/variants/SFE_ARTEMIS/mbed/.ld-symbols b/variants/SFE_ARTEMIS/mbed/.ld-symbols
index 4be0f2a9..8f0f1095 100644
--- a/variants/SFE_ARTEMIS/mbed/.ld-symbols
+++ b/variants/SFE_ARTEMIS/mbed/.ld-symbols
@@ -1 +1 @@
--DAM_CUSTOM_BDADDR -DAM_PACKAGE_BGA -DARDUINO_BLE_FIX -DARM_MATH_CM4 -DCOMPONENT_FLASHIAP=1 -DCORDIO_ZERO_COPY_HCI -DDEVICE_FLASH=1 -DDEVICE_I2C=1 -DDEVICE_INTERRUPTIN=1 -DDEVICE_LPTICKER=1 -DDEVICE_MPU=1 -DDEVICE_SERIAL=1 -DDEVICE_SPI=1 -DDEVICE_STDIO_MESSAGES=1 -DDEVICE_USTICKER=1 -DFEATURE_BLE=1 -DMBED_BUILD_TIMESTAMP=1625745691.784154 -DTARGET_AMA3B1KK -DTARGET_Ambiq_Micro -DTARGET_Apollo3 -DTARGET_CORDIO -DTARGET_CORTEX -DTARGET_CORTEX_M -DTARGET_FAMILY_Apollo3 -DTARGET_LIKE_CORTEX_M4 -DTARGET_LIKE_MBED -DTARGET_M4 -DTARGET_NAME=SFE_ARTEMIS -DTARGET_RELEASE -DTARGET_RTOS_M4_M7 -DTARGET_SFE_ARTEMIS -DTOOLCHAIN_GCC -DTOOLCHAIN_GCC_ARM -D__CMSIS_RTOS -D__CORTEX_M4 -D__FPU_PRESENT=1 -D__MBED_CMSIS_RTOS_CM -D__MBED__=1 
\ No newline at end of file
+-DAM_CUSTOM_BDADDR -DAM_PACKAGE_BGA -DARDUINO_BLE_FIX -DARM_MATH_CM4 -DCOMPONENT_FLASHIAP=1 -DCORDIO_ZERO_COPY_HCI -DDEVICE_FLASH=1 -DDEVICE_I2C=1 -DDEVICE_INTERRUPTIN=1 -DDEVICE_LPTICKER=1 -DDEVICE_MPU=1 -DDEVICE_SERIAL=1 -DDEVICE_SPI=1 -DDEVICE_STDIO_MESSAGES=1 -DDEVICE_USTICKER=1 -DFEATURE_BLE=1 -DMBED_BUILD_TIMESTAMP=1639060310.9699843 -DTARGET_AMA3B1KK -DTARGET_Ambiq_Micro -DTARGET_Apollo3 -DTARGET_CORDIO -DTARGET_CORTEX -DTARGET_CORTEX_M -DTARGET_FAMILY_Apollo3 -DTARGET_LIKE_CORTEX_M4 -DTARGET_LIKE_MBED -DTARGET_M4 -DTARGET_NAME=SFE_ARTEMIS -DTARGET_RELEASE -DTARGET_RTOS_M4_M7 -DTARGET_SFE_ARTEMIS -DTOOLCHAIN_GCC -DTOOLCHAIN_GCC_ARM -D__CMSIS_RTOS -D__CORTEX_M4 -D__FPU_PRESENT=1 -D__MBED_CMSIS_RTOS_CM -D__MBED__=1 
\ No newline at end of file
diff --git a/variants/SFE_ARTEMIS/mbed/libmbed-os.a b/variants/SFE_ARTEMIS/mbed/libmbed-os.a
index d4c17b41..21fac51c 100644
Binary files a/variants/SFE_ARTEMIS/mbed/libmbed-os.a and b/variants/SFE_ARTEMIS/mbed/libmbed-os.a differ
diff --git a/variants/SFE_ARTEMIS_ATP/mbed/.ld-symbols b/variants/SFE_ARTEMIS_ATP/mbed/.ld-symbols
index 5ba67feb..9baaa8b2 100644
--- a/variants/SFE_ARTEMIS_ATP/mbed/.ld-symbols
+++ b/variants/SFE_ARTEMIS_ATP/mbed/.ld-symbols
@@ -1 +1 @@
--DAM_CUSTOM_BDADDR -DAM_PACKAGE_BGA -DARDUINO_BLE_FIX -DARM_MATH_CM4 -DCOMPONENT_FLASHIAP=1 -DCORDIO_ZERO_COPY_HCI -DDEVICE_FLASH=1 -DDEVICE_I2C=1 -DDEVICE_INTERRUPTIN=1 -DDEVICE_LPTICKER=1 -DDEVICE_MPU=1 -DDEVICE_SERIAL=1 -DDEVICE_SPI=1 -DDEVICE_STDIO_MESSAGES=1 -DDEVICE_USTICKER=1 -DFEATURE_BLE=1 -DMBED_BUILD_TIMESTAMP=1625745857.5121255 -DTARGET_AMA3B1KK -DTARGET_Ambiq_Micro -DTARGET_Apollo3 -DTARGET_CORDIO -DTARGET_CORTEX -DTARGET_CORTEX_M -DTARGET_FAMILY_Apollo3 -DTARGET_LIKE_CORTEX_M4 -DTARGET_LIKE_MBED -DTARGET_M4 -DTARGET_NAME=SFE_ARTEMIS_ATP -DTARGET_RELEASE -DTARGET_RTOS_M4_M7 -DTARGET_SFE_ARTEMIS_ATP -DTOOLCHAIN_GCC -DTOOLCHAIN_GCC_ARM -D__CMSIS_RTOS -D__CORTEX_M4 -D__FPU_PRESENT=1 -D__MBED_CMSIS_RTOS_CM -D__MBED__=1 
\ No newline at end of file
+-DAM_CUSTOM_BDADDR -DAM_PACKAGE_BGA -DARDUINO_BLE_FIX -DARM_MATH_CM4 -DCOMPONENT_FLASHIAP=1 -DCORDIO_ZERO_COPY_HCI -DDEVICE_FLASH=1 -DDEVICE_I2C=1 -DDEVICE_INTERRUPTIN=1 -DDEVICE_LPTICKER=1 -DDEVICE_MPU=1 -DDEVICE_SERIAL=1 -DDEVICE_SPI=1 -DDEVICE_STDIO_MESSAGES=1 -DDEVICE_USTICKER=1 -DFEATURE_BLE=1 -DMBED_BUILD_TIMESTAMP=1639060463.782133 -DTARGET_AMA3B1KK -DTARGET_Ambiq_Micro -DTARGET_Apollo3 -DTARGET_CORDIO -DTARGET_CORTEX -DTARGET_CORTEX_M -DTARGET_FAMILY_Apollo3 -DTARGET_LIKE_CORTEX_M4 -DTARGET_LIKE_MBED -DTARGET_M4 -DTARGET_NAME=SFE_ARTEMIS_ATP -DTARGET_RELEASE -DTARGET_RTOS_M4_M7 -DTARGET_SFE_ARTEMIS_ATP -DTOOLCHAIN_GCC -DTOOLCHAIN_GCC_ARM -D__CMSIS_RTOS -D__CORTEX_M4 -D__FPU_PRESENT=1 -D__MBED_CMSIS_RTOS_CM -D__MBED__=1 
\ No newline at end of file
diff --git a/variants/SFE_ARTEMIS_ATP/mbed/libmbed-os.a b/variants/SFE_ARTEMIS_ATP/mbed/libmbed-os.a
index 10221b34..e0e1682d 100644
Binary files a/variants/SFE_ARTEMIS_ATP/mbed/libmbed-os.a and b/variants/SFE_ARTEMIS_ATP/mbed/libmbed-os.a differ
diff --git a/variants/SFE_ARTEMIS_DK/mbed/.ld-symbols b/variants/SFE_ARTEMIS_DK/mbed/.ld-symbols
index 903e6be9..80d3cba0 100644
--- a/variants/SFE_ARTEMIS_DK/mbed/.ld-symbols
+++ b/variants/SFE_ARTEMIS_DK/mbed/.ld-symbols
@@ -1 +1 @@
--DAM_CUSTOM_BDADDR -DAM_PACKAGE_BGA -DARDUINO_BLE_FIX -DARM_MATH_CM4 -DCOMPONENT_FLASHIAP=1 -DCOMPONENT_hm01b0=1 -DCOMPONENT_lis2dh12=1 -DCORDIO_ZERO_COPY_HCI -DDEVICE_FLASH=1 -DDEVICE_I2C=1 -DDEVICE_INTERRUPTIN=1 -DDEVICE_LPTICKER=1 -DDEVICE_MPU=1 -DDEVICE_SERIAL=1 -DDEVICE_SPI=1 -DDEVICE_STDIO_MESSAGES=1 -DDEVICE_USTICKER=1 -DFEATURE_BLE=1 -DMBED_BUILD_TIMESTAMP=1625746018.8323786 -DTARGET_AMA3B1KK -DTARGET_Ambiq_Micro -DTARGET_Apollo3 -DTARGET_CORDIO -DTARGET_CORTEX -DTARGET_CORTEX_M -DTARGET_FAMILY_Apollo3 -DTARGET_LIKE_CORTEX_M4 -DTARGET_LIKE_MBED -DTARGET_M4 -DTARGET_NAME=SFE_ARTEMIS_DK -DTARGET_RELEASE -DTARGET_RTOS_M4_M7 -DTARGET_SFE_ARTEMIS_DK -DTOOLCHAIN_GCC -DTOOLCHAIN_GCC_ARM -D__CMSIS_RTOS -D__CORTEX_M4 -D__FPU_PRESENT=1 -D__MBED_CMSIS_RTOS_CM -D__MBED__=1 
\ No newline at end of file
+-DAM_CUSTOM_BDADDR -DAM_PACKAGE_BGA -DARDUINO_BLE_FIX -DARM_MATH_CM4 -DCOMPONENT_FLASHIAP=1 -DCOMPONENT_hm01b0=1 -DCOMPONENT_lis2dh12=1 -DCORDIO_ZERO_COPY_HCI -DDEVICE_FLASH=1 -DDEVICE_I2C=1 -DDEVICE_INTERRUPTIN=1 -DDEVICE_LPTICKER=1 -DDEVICE_MPU=1 -DDEVICE_SERIAL=1 -DDEVICE_SPI=1 -DDEVICE_STDIO_MESSAGES=1 -DDEVICE_USTICKER=1 -DFEATURE_BLE=1 -DMBED_BUILD_TIMESTAMP=1639060617.2002084 -DTARGET_AMA3B1KK -DTARGET_Ambiq_Micro -DTARGET_Apollo3 -DTARGET_CORDIO -DTARGET_CORTEX -DTARGET_CORTEX_M -DTARGET_FAMILY_Apollo3 -DTARGET_LIKE_CORTEX_M4 -DTARGET_LIKE_MBED -DTARGET_M4 -DTARGET_NAME=SFE_ARTEMIS_DK -DTARGET_RELEASE -DTARGET_RTOS_M4_M7 -DTARGET_SFE_ARTEMIS_DK -DTOOLCHAIN_GCC -DTOOLCHAIN_GCC_ARM -D__CMSIS_RTOS -D__CORTEX_M4 -D__FPU_PRESENT=1 -D__MBED_CMSIS_RTOS_CM -D__MBED__=1 
\ No newline at end of file
diff --git a/variants/SFE_ARTEMIS_DK/mbed/libmbed-os.a b/variants/SFE_ARTEMIS_DK/mbed/libmbed-os.a
index cc7eff94..1b8d674b 100644
Binary files a/variants/SFE_ARTEMIS_DK/mbed/libmbed-os.a and b/variants/SFE_ARTEMIS_DK/mbed/libmbed-os.a differ
diff --git a/variants/SFE_ARTEMIS_MM_PB/mbed/.ld-symbols b/variants/SFE_ARTEMIS_MM_PB/mbed/.ld-symbols
index 4038b04c..007e58e8 100644
--- a/variants/SFE_ARTEMIS_MM_PB/mbed/.ld-symbols
+++ b/variants/SFE_ARTEMIS_MM_PB/mbed/.ld-symbols
@@ -1 +1 @@
--DAM_CUSTOM_BDADDR -DAM_PACKAGE_BGA -DARDUINO_BLE_FIX -DARM_MATH_CM4 -DCOMPONENT_FLASHIAP=1 -DCORDIO_ZERO_COPY_HCI -DDEVICE_FLASH=1 -DDEVICE_I2C=1 -DDEVICE_INTERRUPTIN=1 -DDEVICE_LPTICKER=1 -DDEVICE_MPU=1 -DDEVICE_SERIAL=1 -DDEVICE_SPI=1 -DDEVICE_STDIO_MESSAGES=1 -DDEVICE_USTICKER=1 -DFEATURE_BLE=1 -DMBED_BUILD_TIMESTAMP=1625746820.001523 -DTARGET_AMA3B1KK -DTARGET_Ambiq_Micro -DTARGET_Apollo3 -DTARGET_CORDIO -DTARGET_CORTEX -DTARGET_CORTEX_M -DTARGET_FAMILY_Apollo3 -DTARGET_LIKE_CORTEX_M4 -DTARGET_LIKE_MBED -DTARGET_M4 -DTARGET_NAME=SFE_ARTEMIS_MM_PB -DTARGET_RELEASE -DTARGET_RTOS_M4_M7 -DTARGET_SFE_ARTEMIS_MM_PB -DTOOLCHAIN_GCC -DTOOLCHAIN_GCC_ARM -D__CMSIS_RTOS -D__CORTEX_M4 -D__FPU_PRESENT=1 -D__MBED_CMSIS_RTOS_CM -D__MBED__=1 
\ No newline at end of file
+-DAM_CUSTOM_BDADDR -DAM_PACKAGE_BGA -DARDUINO_BLE_FIX -DARM_MATH_CM4 -DCOMPONENT_FLASHIAP=1 -DCORDIO_ZERO_COPY_HCI -DDEVICE_FLASH=1 -DDEVICE_I2C=1 -DDEVICE_INTERRUPTIN=1 -DDEVICE_LPTICKER=1 -DDEVICE_MPU=1 -DDEVICE_SERIAL=1 -DDEVICE_SPI=1 -DDEVICE_STDIO_MESSAGES=1 -DDEVICE_USTICKER=1 -DFEATURE_BLE=1 -DMBED_BUILD_TIMESTAMP=1639061386.4531405 -DTARGET_AMA3B1KK -DTARGET_Ambiq_Micro -DTARGET_Apollo3 -DTARGET_CORDIO -DTARGET_CORTEX -DTARGET_CORTEX_M -DTARGET_FAMILY_Apollo3 -DTARGET_LIKE_CORTEX_M4 -DTARGET_LIKE_MBED -DTARGET_M4 -DTARGET_NAME=SFE_ARTEMIS_MM_PB -DTARGET_RELEASE -DTARGET_RTOS_M4_M7 -DTARGET_SFE_ARTEMIS_MM_PB -DTOOLCHAIN_GCC -DTOOLCHAIN_GCC_ARM -D__CMSIS_RTOS -D__CORTEX_M4 -D__FPU_PRESENT=1 -D__MBED_CMSIS_RTOS_CM -D__MBED__=1 
\ No newline at end of file
diff --git a/variants/SFE_ARTEMIS_MM_PB/mbed/libmbed-os.a b/variants/SFE_ARTEMIS_MM_PB/mbed/libmbed-os.a
index a5a0ef98..93630863 100644
Binary files a/variants/SFE_ARTEMIS_MM_PB/mbed/libmbed-os.a and b/variants/SFE_ARTEMIS_MM_PB/mbed/libmbed-os.a differ
diff --git a/variants/SFE_ARTEMIS_MODULE/mbed/.ld-symbols b/variants/SFE_ARTEMIS_MODULE/mbed/.ld-symbols
index 30d40122..be09c212 100644
--- a/variants/SFE_ARTEMIS_MODULE/mbed/.ld-symbols
+++ b/variants/SFE_ARTEMIS_MODULE/mbed/.ld-symbols
@@ -1 +1 @@
--DAM_CUSTOM_BDADDR -DAM_PACKAGE_BGA -DARDUINO_BLE_FIX -DARM_MATH_CM4 -DCOMPONENT_FLASHIAP=1 -DCORDIO_ZERO_COPY_HCI -DDEVICE_FLASH=1 -DDEVICE_I2C=1 -DDEVICE_INTERRUPTIN=1 -DDEVICE_LPTICKER=1 -DDEVICE_MPU=1 -DDEVICE_SERIAL=1 -DDEVICE_SPI=1 -DDEVICE_STDIO_MESSAGES=1 -DDEVICE_USTICKER=1 -DFEATURE_BLE=1 -DMBED_BUILD_TIMESTAMP=1625746981.1756315 -DTARGET_AMA3B1KK -DTARGET_Ambiq_Micro -DTARGET_Apollo3 -DTARGET_CORDIO -DTARGET_CORTEX -DTARGET_CORTEX_M -DTARGET_FAMILY_Apollo3 -DTARGET_LIKE_CORTEX_M4 -DTARGET_LIKE_MBED -DTARGET_M4 -DTARGET_NAME=SFE_ARTEMIS_MODULE -DTARGET_RELEASE -DTARGET_RTOS_M4_M7 -DTARGET_SFE_ARTEMIS_MODULE -DTOOLCHAIN_GCC -DTOOLCHAIN_GCC_ARM -D__CMSIS_RTOS -D__CORTEX_M4 -D__FPU_PRESENT=1 -D__MBED_CMSIS_RTOS_CM -D__MBED__=1 
\ No newline at end of file
+-DAM_CUSTOM_BDADDR -DAM_PACKAGE_BGA -DARDUINO_BLE_FIX -DARM_MATH_CM4 -DCOMPONENT_FLASHIAP=1 -DCORDIO_ZERO_COPY_HCI -DDEVICE_FLASH=1 -DDEVICE_I2C=1 -DDEVICE_INTERRUPTIN=1 -DDEVICE_LPTICKER=1 -DDEVICE_MPU=1 -DDEVICE_SERIAL=1 -DDEVICE_SPI=1 -DDEVICE_STDIO_MESSAGES=1 -DDEVICE_USTICKER=1 -DFEATURE_BLE=1 -DMBED_BUILD_TIMESTAMP=1639061539.68951 -DTARGET_AMA3B1KK -DTARGET_Ambiq_Micro -DTARGET_Apollo3 -DTARGET_CORDIO -DTARGET_CORTEX -DTARGET_CORTEX_M -DTARGET_FAMILY_Apollo3 -DTARGET_LIKE_CORTEX_M4 -DTARGET_LIKE_MBED -DTARGET_M4 -DTARGET_NAME=SFE_ARTEMIS_MODULE -DTARGET_RELEASE -DTARGET_RTOS_M4_M7 -DTARGET_SFE_ARTEMIS_MODULE -DTOOLCHAIN_GCC -DTOOLCHAIN_GCC_ARM -D__CMSIS_RTOS -D__CORTEX_M4 -D__FPU_PRESENT=1 -D__MBED_CMSIS_RTOS_CM -D__MBED__=1 
\ No newline at end of file
diff --git a/variants/SFE_ARTEMIS_MODULE/mbed/libmbed-os.a b/variants/SFE_ARTEMIS_MODULE/mbed/libmbed-os.a
index b997edb0..04813ba2 100644
Binary files a/variants/SFE_ARTEMIS_MODULE/mbed/libmbed-os.a and b/variants/SFE_ARTEMIS_MODULE/mbed/libmbed-os.a differ
diff --git a/variants/SFE_ARTEMIS_MODULE/variant.h b/variants/SFE_ARTEMIS_MODULE/variant.h
index eb03d890..ced95960 100644
--- a/variants/SFE_ARTEMIS_MODULE/variant.h
+++ b/variants/SFE_ARTEMIS_MODULE/variant.h
@@ -10,7 +10,13 @@
 
 #include "config/pins.h"
 
-#define VARIANT_SPI_INTFCS  0
-#define VARIANT_WIRE_INTFCS 0
+#define VARIANT_SPI_INTFCS 0
+#define VARIANT_WIRE_INTFCS 1
+
+// Add a default wire pin so that Wire is available to libraries and sketches
+// Since this is just a module no pins are labeled I2C/Wire/Qwiic by default
+// 2 pins have been chosen here arbitrarily
+#define VARIANT_Wire_SDA 9
+#define VARIANT_Wire_SCL 8
 
 #endif // _VARIANT_H_
diff --git a/variants/SFE_ARTEMIS_NANO/mbed/.ld-symbols b/variants/SFE_ARTEMIS_NANO/mbed/.ld-symbols
index 826cf177..385f019a 100644
--- a/variants/SFE_ARTEMIS_NANO/mbed/.ld-symbols
+++ b/variants/SFE_ARTEMIS_NANO/mbed/.ld-symbols
@@ -1 +1 @@
--DAM_CUSTOM_BDADDR -DAM_PACKAGE_BGA -DARDUINO_BLE_FIX -DARM_MATH_CM4 -DCOMPONENT_FLASHIAP=1 -DCORDIO_ZERO_COPY_HCI -DDEVICE_FLASH=1 -DDEVICE_I2C=1 -DDEVICE_INTERRUPTIN=1 -DDEVICE_LPTICKER=1 -DDEVICE_MPU=1 -DDEVICE_SERIAL=1 -DDEVICE_SPI=1 -DDEVICE_STDIO_MESSAGES=1 -DDEVICE_USTICKER=1 -DFEATURE_BLE=1 -DMBED_BUILD_TIMESTAMP=1625746181.5885904 -DTARGET_AMA3B1KK -DTARGET_Ambiq_Micro -DTARGET_Apollo3 -DTARGET_CORDIO -DTARGET_CORTEX -DTARGET_CORTEX_M -DTARGET_FAMILY_Apollo3 -DTARGET_LIKE_CORTEX_M4 -DTARGET_LIKE_MBED -DTARGET_M4 -DTARGET_NAME=SFE_ARTEMIS_NANO -DTARGET_RELEASE -DTARGET_RTOS_M4_M7 -DTARGET_SFE_ARTEMIS_NANO -DTOOLCHAIN_GCC -DTOOLCHAIN_GCC_ARM -D__CMSIS_RTOS -D__CORTEX_M4 -D__FPU_PRESENT=1 -D__MBED_CMSIS_RTOS_CM -D__MBED__=1 
\ No newline at end of file
+-DAM_CUSTOM_BDADDR -DAM_PACKAGE_BGA -DARDUINO_BLE_FIX -DARM_MATH_CM4 -DCOMPONENT_FLASHIAP=1 -DCORDIO_ZERO_COPY_HCI -DDEVICE_FLASH=1 -DDEVICE_I2C=1 -DDEVICE_INTERRUPTIN=1 -DDEVICE_LPTICKER=1 -DDEVICE_MPU=1 -DDEVICE_SERIAL=1 -DDEVICE_SPI=1 -DDEVICE_STDIO_MESSAGES=1 -DDEVICE_USTICKER=1 -DFEATURE_BLE=1 -DMBED_BUILD_TIMESTAMP=1639060771.8071952 -DTARGET_AMA3B1KK -DTARGET_Ambiq_Micro -DTARGET_Apollo3 -DTARGET_CORDIO -DTARGET_CORTEX -DTARGET_CORTEX_M -DTARGET_FAMILY_Apollo3 -DTARGET_LIKE_CORTEX_M4 -DTARGET_LIKE_MBED -DTARGET_M4 -DTARGET_NAME=SFE_ARTEMIS_NANO -DTARGET_RELEASE -DTARGET_RTOS_M4_M7 -DTARGET_SFE_ARTEMIS_NANO -DTOOLCHAIN_GCC -DTOOLCHAIN_GCC_ARM -D__CMSIS_RTOS -D__CORTEX_M4 -D__FPU_PRESENT=1 -D__MBED_CMSIS_RTOS_CM -D__MBED__=1 
\ No newline at end of file
diff --git a/variants/SFE_ARTEMIS_NANO/mbed/libmbed-os.a b/variants/SFE_ARTEMIS_NANO/mbed/libmbed-os.a
index 7e339719..ea790389 100644
Binary files a/variants/SFE_ARTEMIS_NANO/mbed/libmbed-os.a and b/variants/SFE_ARTEMIS_NANO/mbed/libmbed-os.a differ
diff --git a/variants/SFE_ARTEMIS_THING_PLUS/mbed/.ld-symbols b/variants/SFE_ARTEMIS_THING_PLUS/mbed/.ld-symbols
index 7073dab2..6f8c4cdc 100644
--- a/variants/SFE_ARTEMIS_THING_PLUS/mbed/.ld-symbols
+++ b/variants/SFE_ARTEMIS_THING_PLUS/mbed/.ld-symbols
@@ -1 +1 @@
--DAM_CUSTOM_BDADDR -DAM_PACKAGE_BGA -DARDUINO_BLE_FIX -DARM_MATH_CM4 -DCOMPONENT_FLASHIAP=1 -DCORDIO_ZERO_COPY_HCI -DDEVICE_FLASH=1 -DDEVICE_I2C=1 -DDEVICE_INTERRUPTIN=1 -DDEVICE_LPTICKER=1 -DDEVICE_MPU=1 -DDEVICE_SERIAL=1 -DDEVICE_SPI=1 -DDEVICE_STDIO_MESSAGES=1 -DDEVICE_USTICKER=1 -DFEATURE_BLE=1 -DMBED_BUILD_TIMESTAMP=1625746339.3810022 -DTARGET_AMA3B1KK -DTARGET_Ambiq_Micro -DTARGET_Apollo3 -DTARGET_CORDIO -DTARGET_CORTEX -DTARGET_CORTEX_M -DTARGET_FAMILY_Apollo3 -DTARGET_LIKE_CORTEX_M4 -DTARGET_LIKE_MBED -DTARGET_M4 -DTARGET_NAME=SFE_ARTEMIS_THING_PLUS -DTARGET_RELEASE -DTARGET_RTOS_M4_M7 -DTARGET_SFE_ARTEMIS_THING_PLUS -DTOOLCHAIN_GCC -DTOOLCHAIN_GCC_ARM -D__CMSIS_RTOS -D__CORTEX_M4 -D__FPU_PRESENT=1 -D__MBED_CMSIS_RTOS_CM -D__MBED__=1 
\ No newline at end of file
+-DAM_CUSTOM_BDADDR -DAM_PACKAGE_BGA -DARDUINO_BLE_FIX -DARM_MATH_CM4 -DCOMPONENT_FLASHIAP=1 -DCORDIO_ZERO_COPY_HCI -DDEVICE_FLASH=1 -DDEVICE_I2C=1 -DDEVICE_INTERRUPTIN=1 -DDEVICE_LPTICKER=1 -DDEVICE_MPU=1 -DDEVICE_SERIAL=1 -DDEVICE_SPI=1 -DDEVICE_STDIO_MESSAGES=1 -DDEVICE_USTICKER=1 -DFEATURE_BLE=1 -DMBED_BUILD_TIMESTAMP=1639060925.1107073 -DTARGET_AMA3B1KK -DTARGET_Ambiq_Micro -DTARGET_Apollo3 -DTARGET_CORDIO -DTARGET_CORTEX -DTARGET_CORTEX_M -DTARGET_FAMILY_Apollo3 -DTARGET_LIKE_CORTEX_M4 -DTARGET_LIKE_MBED -DTARGET_M4 -DTARGET_NAME=SFE_ARTEMIS_THING_PLUS -DTARGET_RELEASE -DTARGET_RTOS_M4_M7 -DTARGET_SFE_ARTEMIS_THING_PLUS -DTOOLCHAIN_GCC -DTOOLCHAIN_GCC_ARM -D__CMSIS_RTOS -D__CORTEX_M4 -D__FPU_PRESENT=1 -D__MBED_CMSIS_RTOS_CM -D__MBED__=1 
\ No newline at end of file
diff --git a/variants/SFE_ARTEMIS_THING_PLUS/mbed/libmbed-os.a b/variants/SFE_ARTEMIS_THING_PLUS/mbed/libmbed-os.a
index 102d1c98..0cd7c018 100644
Binary files a/variants/SFE_ARTEMIS_THING_PLUS/mbed/libmbed-os.a and b/variants/SFE_ARTEMIS_THING_PLUS/mbed/libmbed-os.a differ
diff --git a/variants/SFE_EDGE/mbed/.ld-symbols b/variants/SFE_EDGE/mbed/.ld-symbols
index b291b1b5..8d0af64f 100644
--- a/variants/SFE_EDGE/mbed/.ld-symbols
+++ b/variants/SFE_EDGE/mbed/.ld-symbols
@@ -1 +1 @@
--DAM_CUSTOM_BDADDR -DAM_PACKAGE_BGA -DARDUINO_BLE_FIX -DARM_MATH_CM4 -DCOMPONENT_FLASHIAP=1 -DCOMPONENT_hm01b0=1 -DCOMPONENT_lis2dh12=1 -DCORDIO_ZERO_COPY_HCI -DDEVICE_FLASH=1 -DDEVICE_I2C=1 -DDEVICE_INTERRUPTIN=1 -DDEVICE_LPTICKER=1 -DDEVICE_MPU=1 -DDEVICE_SERIAL=1 -DDEVICE_SPI=1 -DDEVICE_STDIO_MESSAGES=1 -DDEVICE_USTICKER=1 -DFEATURE_BLE=1 -DMBED_BUILD_TIMESTAMP=1625746502.8322625 -DTARGET_AMA3B1KK -DTARGET_Ambiq_Micro -DTARGET_Apollo3 -DTARGET_CORDIO -DTARGET_CORTEX -DTARGET_CORTEX_M -DTARGET_FAMILY_Apollo3 -DTARGET_LIKE_CORTEX_M4 -DTARGET_LIKE_MBED -DTARGET_M4 -DTARGET_NAME=SFE_EDGE -DTARGET_RELEASE -DTARGET_RTOS_M4_M7 -DTARGET_SFE_EDGE -DTOOLCHAIN_GCC -DTOOLCHAIN_GCC_ARM -D__CMSIS_RTOS -D__CORTEX_M4 -D__FPU_PRESENT=1 -D__MBED_CMSIS_RTOS_CM -D__MBED__=1 
\ No newline at end of file
+-DAM_CUSTOM_BDADDR -DAM_PACKAGE_BGA -DARDUINO_BLE_FIX -DARM_MATH_CM4 -DCOMPONENT_FLASHIAP=1 -DCOMPONENT_hm01b0=1 -DCOMPONENT_lis2dh12=1 -DCORDIO_ZERO_COPY_HCI -DDEVICE_FLASH=1 -DDEVICE_I2C=1 -DDEVICE_INTERRUPTIN=1 -DDEVICE_LPTICKER=1 -DDEVICE_MPU=1 -DDEVICE_SERIAL=1 -DDEVICE_SPI=1 -DDEVICE_STDIO_MESSAGES=1 -DDEVICE_USTICKER=1 -DFEATURE_BLE=1 -DMBED_BUILD_TIMESTAMP=1639061078.175116 -DTARGET_AMA3B1KK -DTARGET_Ambiq_Micro -DTARGET_Apollo3 -DTARGET_CORDIO -DTARGET_CORTEX -DTARGET_CORTEX_M -DTARGET_FAMILY_Apollo3 -DTARGET_LIKE_CORTEX_M4 -DTARGET_LIKE_MBED -DTARGET_M4 -DTARGET_NAME=SFE_EDGE -DTARGET_RELEASE -DTARGET_RTOS_M4_M7 -DTARGET_SFE_EDGE -DTOOLCHAIN_GCC -DTOOLCHAIN_GCC_ARM -D__CMSIS_RTOS -D__CORTEX_M4 -D__FPU_PRESENT=1 -D__MBED_CMSIS_RTOS_CM -D__MBED__=1 
\ No newline at end of file
diff --git a/variants/SFE_EDGE/mbed/libmbed-os.a b/variants/SFE_EDGE/mbed/libmbed-os.a
index c2941ab7..7fe06042 100644
Binary files a/variants/SFE_EDGE/mbed/libmbed-os.a and b/variants/SFE_EDGE/mbed/libmbed-os.a differ
diff --git a/variants/SFE_EDGE2/mbed/.ld-symbols b/variants/SFE_EDGE2/mbed/.ld-symbols
index 9dd8199f..2a99721a 100644
--- a/variants/SFE_EDGE2/mbed/.ld-symbols
+++ b/variants/SFE_EDGE2/mbed/.ld-symbols
@@ -1 +1 @@
--DAM_CUSTOM_BDADDR -DAM_PACKAGE_BGA -DARDUINO_BLE_FIX -DARM_MATH_CM4 -DCOMPONENT_FLASHIAP=1 -DCOMPONENT_hm01b0=1 -DCOMPONENT_lis2dh12=1 -DCORDIO_ZERO_COPY_HCI -DDEVICE_FLASH=1 -DDEVICE_I2C=1 -DDEVICE_INTERRUPTIN=1 -DDEVICE_LPTICKER=1 -DDEVICE_MPU=1 -DDEVICE_SERIAL=1 -DDEVICE_SPI=1 -DDEVICE_STDIO_MESSAGES=1 -DDEVICE_USTICKER=1 -DFEATURE_BLE=1 -DMBED_BUILD_TIMESTAMP=1625746661.8420415 -DTARGET_AMA3B1KK -DTARGET_Ambiq_Micro -DTARGET_Apollo3 -DTARGET_CORDIO -DTARGET_CORTEX -DTARGET_CORTEX_M -DTARGET_FAMILY_Apollo3 -DTARGET_LIKE_CORTEX_M4 -DTARGET_LIKE_MBED -DTARGET_M4 -DTARGET_NAME=SFE_EDGE2 -DTARGET_RELEASE -DTARGET_RTOS_M4_M7 -DTARGET_SFE_EDGE2 -DTOOLCHAIN_GCC -DTOOLCHAIN_GCC_ARM -D__CMSIS_RTOS -D__CORTEX_M4 -D__FPU_PRESENT=1 -D__MBED_CMSIS_RTOS_CM -D__MBED__=1 
\ No newline at end of file
+-DAM_CUSTOM_BDADDR -DAM_PACKAGE_BGA -DARDUINO_BLE_FIX -DARM_MATH_CM4 -DCOMPONENT_FLASHIAP=1 -DCOMPONENT_hm01b0=1 -DCOMPONENT_lis2dh12=1 -DCORDIO_ZERO_COPY_HCI -DDEVICE_FLASH=1 -DDEVICE_I2C=1 -DDEVICE_INTERRUPTIN=1 -DDEVICE_LPTICKER=1 -DDEVICE_MPU=1 -DDEVICE_SERIAL=1 -DDEVICE_SPI=1 -DDEVICE_STDIO_MESSAGES=1 -DDEVICE_USTICKER=1 -DFEATURE_BLE=1 -DMBED_BUILD_TIMESTAMP=1639061232.332364 -DTARGET_AMA3B1KK -DTARGET_Ambiq_Micro -DTARGET_Apollo3 -DTARGET_CORDIO -DTARGET_CORTEX -DTARGET_CORTEX_M -DTARGET_FAMILY_Apollo3 -DTARGET_LIKE_CORTEX_M4 -DTARGET_LIKE_MBED -DTARGET_M4 -DTARGET_NAME=SFE_EDGE2 -DTARGET_RELEASE -DTARGET_RTOS_M4_M7 -DTARGET_SFE_EDGE2 -DTOOLCHAIN_GCC -DTOOLCHAIN_GCC_ARM -D__CMSIS_RTOS -D__CORTEX_M4 -D__FPU_PRESENT=1 -D__MBED_CMSIS_RTOS_CM -D__MBED__=1 
\ No newline at end of file
diff --git a/variants/SFE_EDGE2/mbed/libmbed-os.a b/variants/SFE_EDGE2/mbed/libmbed-os.a
index c6b2fbb9..02226ce4 100644
Binary files a/variants/SFE_EDGE2/mbed/libmbed-os.a and b/variants/SFE_EDGE2/mbed/libmbed-os.a differ