                                         
         // Find the service
         let service = IOServiceGetMatchingService(kIOMasterPortDefault,
-                      IOServiceMatching(SMC.IOSERVICE_MODEL).takeUnretainedValue())
+                      IOServiceMatching(IOSERVICE_MODEL).takeUnretainedValue())
 
         if (service == 0) {
             #if DEBUG
-                println("ERROR - \(__FILE__):\(__FUNCTION__) -"
-                        + " \(IOSERVICE_MODEL) service not found")
+                println("ERROR - \(__FILE__):\(__FUNCTION__) - " +
+                        "\(IOSERVICE_MODEL) service not found")
             #endif
             return model
         }

        
        if (result != kIOReturnSuccess) {
            #if DEBUG
                println("ERROR - \(__FILE__):\(__FUNCTION__) - IOReturn ="
                        + " \(result) - kSMC = \(outputStruct.result)")
            #endif
        }


        if (NSJSONSerialization.writeJSONObject(data,
                                                toStream : outputStream!,
                                                options  : opts,
                                                error    : &error) != 0) {
            result = true
        }
        
        
        #if DEBUG
            if (error != nil) {
                println("ERROR - \(__FILE__):\(__FUNCTION__) - WRITE FAILED - "
                        + "\(error)")
            }
        #endif
        
