diff --git a/examples/Advanced/11-RGB_LED/11-RGB_LED.ino b/examples/Advanced/11-RGB_LED/11-RGB_LED.ino
index c8309e9..bb1f7a7 100644
--- a/examples/Advanced/11-RGB_LED/11-RGB_LED.ino
+++ b/examples/Advanced/11-RGB_LED/11-RGB_LED.ino
@@ -23,7 +23,7 @@ void setup() {
   
   Serial.begin(115200);
 
-  homeSpan.begin(Category::Lighting,"HomeSpan LEDs");
+  homeSpan.begin(Category::Bridges,"HomeSpan Bridge");
 
 
   new SpanAccessory();  
diff --git a/examples/Advanced/12-ServiceOptions/12-ServiceOptions.ino b/examples/Advanced/12-ServiceOptions/12-ServiceOptions.ino
index d839a3a..0027665 100644
--- a/examples/Advanced/12-ServiceOptions/12-ServiceOptions.ino
+++ b/examples/Advanced/12-ServiceOptions/12-ServiceOptions.ino
@@ -20,7 +20,7 @@ void setup() {
   
   Serial.begin(115200);
 
-  homeSpan.begin(Category::Lighting,"HomeSpan LEDs");
+  homeSpan.begin(Category::Bridges,"HomeSpan Bridge");
 
   new SpanAccessory();  
     new DEV_Identify("Bridge #1","HomeSpan","123-ABC","HS Bridge","0.9",3);
@@ -42,17 +42,32 @@ void setup() {
       new Characteristic::Active();             
       new Characteristic::RotationDirection();
       new Characteristic::RotationSpeed(0);
-
+      
   new SpanAccessory();                                                          
     new DEV_Identify("Ceiling Fan #3","HomeSpan","123-ABC","20mA LED","0.9",0);
-    new DEV_DimmableLED(0,17);
-    new Characteristic::Name("Main Light");
+    new DEV_DimmableLED(0,17);    
+      new Characteristic::Name("Main Light");
+    new DEV_LED(16);    
+      new Characteristic::Name("Night Light");
     new Service::Fan(ServiceType::Primary);                             
       new Characteristic::Active();             
       new Characteristic::RotationDirection();
       new Characteristic::RotationSpeed(0);
       new Characteristic::Name("Fan");
-      
+
+  new SpanAccessory();                                                          
+    new DEV_Identify("Ceiling Fan #4","HomeSpan","123-ABC","20mA LED","0.9",0,ServiceType::Primary);
+    new DEV_DimmableLED(0,17);    
+      new Characteristic::Name("Main Light");
+    new DEV_LED(16);    
+      new Characteristic::Name("Night Light");
+    new Service::Fan();                             
+      new Characteristic::Active();             
+      new Characteristic::RotationDirection();
+      new Characteristic::RotationSpeed(0);
+      new Characteristic::Name("Fan");
+
+
 } // end of setup()
 
 //////////////////////////////////////
diff --git a/examples/Advanced/12-ServiceOptions/DEV_Identify.h b/examples/Advanced/12-ServiceOptions/DEV_Identify.h
index 7e6826f..17f7638 100644
--- a/examples/Advanced/12-ServiceOptions/DEV_Identify.h
+++ b/examples/Advanced/12-ServiceOptions/DEV_Identify.h
@@ -8,7 +8,7 @@ struct DEV_Identify : Service::AccessoryInformation {
   int nBlinks;                    // number of times to blink built-in LED in identify routine
   SpanCharacteristic *identify;   // reference to the Identify Characteristic
   
-  DEV_Identify(char *name, char *manu, char *sn, char *model, char *version, int nBlinks) : Service::AccessoryInformation(){
+  DEV_Identify(char *name, char *manu, char *sn, char *model, char *version, int nBlinks, ServiceType sType=ServiceType::Regular) : Service::AccessoryInformation(sType){
     
     new Characteristic::Name(name);                   // create all the required Characteristics with values set based on above arguments
     new Characteristic::Manufacturer(manu);