diff --git a/AntMessageProtocol.podspec b/AntMessageProtocol.podspec
index 6c806b6..107dba5 100644
--- a/AntMessageProtocol.podspec
+++ b/AntMessageProtocol.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'AntMessageProtocol'
-  s.version          = '1.1.0'
+  s.version          = '1.1.1'
   s.summary          = 'Encoding and Decoding of the ANT Message Protocol.'
 
 
diff --git a/README.md b/README.md
index 7a3dfe6..094e302 100644
--- a/README.md
+++ b/README.md
@@ -20,16 +20,10 @@ Swift Version of the ANT Message Protocol.
 Swift Package Manager:
 ```swift
     dependencies: [
-        .Package(url: "https://github.com/FitnessKit/AntMessageProtocol", from: "1.1.0")
+        .Package(url: "https://github.com/FitnessKit/AntMessageProtocol", from: "1.1.1")
     ]
 ```
 
-Swift4
-```swift
-    dependencies: [
-        .package(url: "https://github.com/FitnessKit/AntMessageProtocol", .branch("swift42")),
-    ]
-```
 
 ## How to Use
 
diff --git a/Sources/ANTMessageProtocol/Types/Manufacturer/ManufacturerExtension.swift b/Sources/ANTMessageProtocol/Types/Manufacturer/ManufacturerExtension.swift
index ecb9fe0..4626ce8 100644
--- a/Sources/ANTMessageProtocol/Types/Manufacturer/ManufacturerExtension.swift
+++ b/Sources/ANTMessageProtocol/Types/Manufacturer/ManufacturerExtension.swift
@@ -27,352 +27,402 @@ import Foundation
 
 @available(swift 4.0)
 public extension Manufacturer {
-
+    
     /// Unknown ID
     class var unknown: Manufacturer { return Manufacturer(id: 0, name: "Unknown") }
     /// Development ID
     class var development: Manufacturer { return Manufacturer(id: 255, name: "Development") }
-
-
+    
+    
     /// Garmin
-     class var garmin: Manufacturer { return Manufacturer(id: 1, name: "Garmin") }
+    class var garmin: Manufacturer { return Manufacturer(id: 1, name: "Garmin") }
     /// Garmin FR405 ANTFS
-     class var garminFR405: Manufacturer { return Manufacturer(id: 2, name: "Garmin FR405 ANTFS") }
+    class var garminFR405: Manufacturer { return Manufacturer(id: 2, name: "Garmin FR405 ANTFS") }
     /// Zephyr
-     class var zephyr: Manufacturer { return Manufacturer(id: 3, name: "Zephyr") }
+    class var zephyr: Manufacturer { return Manufacturer(id: 3, name: "Zephyr") }
     /// Dayton
-     class var dayton: Manufacturer { return Manufacturer(id: 4, name: "Dayton") }
+    class var dayton: Manufacturer { return Manufacturer(id: 4, name: "Dayton") }
     /// IDT
-     class var idt: Manufacturer { return Manufacturer(id: 5, name: "IDT") }
+    class var idt: Manufacturer { return Manufacturer(id: 5, name: "IDT") }
     /// SRM
-     class var srm: Manufacturer { return Manufacturer(id: 6, name: "SRM") }
+    class var srm: Manufacturer { return Manufacturer(id: 6, name: "SRM") }
     /// Quarq
-     class var quarq: Manufacturer { return Manufacturer(id: 7, name: "Quarq") }
+    class var quarq: Manufacturer { return Manufacturer(id: 7, name: "Quarq") }
     /// iBike
-     class var iBike: Manufacturer { return Manufacturer(id: 8, name: "iBike") }
+    class var iBike: Manufacturer { return Manufacturer(id: 8, name: "iBike") }
     /// Saris
-     class var saris: Manufacturer { return Manufacturer(id: 9, name: "Saris") }
+    class var saris: Manufacturer { return Manufacturer(id: 9, name: "Saris") }
     /// Spart HK
-     class var spartHK: Manufacturer { return Manufacturer(id: 10, name: "Spart HK") }
+    class var spartHK: Manufacturer { return Manufacturer(id: 10, name: "Spart HK") }
     /// Tanita
-     class var tanita: Manufacturer { return Manufacturer(id: 11, name: "Tanita") }
+    class var tanita: Manufacturer { return Manufacturer(id: 11, name: "Tanita") }
     /// Echowell
-     class var echowell: Manufacturer { return Manufacturer(id: 12, name: "Echowell") }
+    class var echowell: Manufacturer { return Manufacturer(id: 12, name: "Echowell") }
     /// Dynastream OEM
-     class var dynastreamOem: Manufacturer { return Manufacturer(id: 13, name: "Dynastream OEM") }
+    class var dynastreamOem: Manufacturer { return Manufacturer(id: 13, name: "Dynastream OEM") }
     /// Nautilus
-     class var nautilus: Manufacturer { return Manufacturer(id: 14, name: "Nautilus") }
+    class var nautilus: Manufacturer { return Manufacturer(id: 14, name: "Nautilus") }
     /// Dynastream
-     class var dynastream: Manufacturer { return Manufacturer(id: 15, name: "Dynastream") }
+    class var dynastream: Manufacturer { return Manufacturer(id: 15, name: "Dynastream") }
     /// Timex
-     class var timex: Manufacturer { return Manufacturer(id: 16, name: "Timex") }
+    class var timex: Manufacturer { return Manufacturer(id: 16, name: "Timex") }
     /// Metrigear
-     class var metrigear: Manufacturer { return Manufacturer(id: 17, name: "Metrigear") }
+    class var metrigear: Manufacturer { return Manufacturer(id: 17, name: "Metrigear") }
     /// Xelic
-     class var xelic: Manufacturer { return Manufacturer(id: 18, name: "Xelic") }
+    class var xelic: Manufacturer { return Manufacturer(id: 18, name: "Xelic") }
     /// Beurer
-     class var beurer: Manufacturer { return Manufacturer(id: 19, name: "Beurer") }
+    class var beurer: Manufacturer { return Manufacturer(id: 19, name: "Beurer") }
     /// Cardiosport
-     class var cardioSport: Manufacturer { return Manufacturer(id: 20, name: "Cardiosport") }
+    class var cardioSport: Manufacturer { return Manufacturer(id: 20, name: "Cardiosport") }
     /// A & D
-     class var aAndD: Manufacturer { return Manufacturer(id: 21, name: "A & D") }
+    class var aAndD: Manufacturer { return Manufacturer(id: 21, name: "A & D") }
     /// HMM
-     class var hmm: Manufacturer { return Manufacturer(id: 22, name: "HMM") }
+    class var hmm: Manufacturer { return Manufacturer(id: 22, name: "HMM") }
     /// SUUNTO
-     class var suunto: Manufacturer { return Manufacturer(id: 23, name: "SUUNTO") }
+    class var suunto: Manufacturer { return Manufacturer(id: 23, name: "SUUNTO") }
     /// Thita Elektronik
-     class var thitaElektronik: Manufacturer { return Manufacturer(id: 24, name: "Thita Elektronik") }
+    class var thitaElektronik: Manufacturer { return Manufacturer(id: 24, name: "Thita Elektronik") }
     /// G.Pulse
-     class var gPulse: Manufacturer { return Manufacturer(id: 25, name: "G.Pulse") }
+    class var gPulse: Manufacturer { return Manufacturer(id: 25, name: "G.Pulse") }
     /// Clean Mobile
-     class var cleanMobile: Manufacturer { return Manufacturer(id: 26, name: "Clean Mobile") }
+    class var cleanMobile: Manufacturer { return Manufacturer(id: 26, name: "Clean Mobile") }
     /// Pedal Brain
-     class var pedalBrain: Manufacturer { return Manufacturer(id: 27, name: "Pedal Brain") }
+    class var pedalBrain: Manufacturer { return Manufacturer(id: 27, name: "Pedal Brain") }
     /// Peaksware
-     class var peaksware: Manufacturer { return Manufacturer(id: 28, name: "Peaksware") }
+    class var peaksware: Manufacturer { return Manufacturer(id: 28, name: "Peaksware") }
     /// Saxonar
-     class var saxonar: Manufacturer { return Manufacturer(id: 29, name: "Saxonar") }
+    class var saxonar: Manufacturer { return Manufacturer(id: 29, name: "Saxonar") }
     /// Lemond Fitness
-     class var lemondFitness: Manufacturer { return Manufacturer(id: 30, name: "Lemond Fitness") }
+    class var lemondFitness: Manufacturer { return Manufacturer(id: 30, name: "Lemond Fitness") }
     /// Dexcom
-     class var dexcom: Manufacturer { return Manufacturer(id: 31, name: "Dexcom") }
+    class var dexcom: Manufacturer { return Manufacturer(id: 31, name: "Dexcom") }
     /// Wahoo Fitness
-     class var wahooFitness: Manufacturer { return Manufacturer(id: 32, name: "Wahoo Fitness") }
+    class var wahooFitness: Manufacturer { return Manufacturer(id: 32, name: "Wahoo Fitness") }
     /// Octane Fitness
-     class var octaneFitness: Manufacturer { return Manufacturer(id: 33, name: "Octane Fitness") }
+    class var octaneFitness: Manufacturer { return Manufacturer(id: 33, name: "Octane Fitness") }
     /// Archinoetics
-     class var archinoetics: Manufacturer { return Manufacturer(id: 34, name: "Archinoetics") }
+    class var archinoetics: Manufacturer { return Manufacturer(id: 34, name: "Archinoetics") }
     /// The Hurt Box
-     class var theHurtBox: Manufacturer { return Manufacturer(id: 35, name: "The Hurt Box") }
+    class var theHurtBox: Manufacturer { return Manufacturer(id: 35, name: "The Hurt Box") }
     /// Citizen Systems
-     class var citizenSystems: Manufacturer { return Manufacturer(id: 36, name: "Citizen Systems") }
+    class var citizenSystems: Manufacturer { return Manufacturer(id: 36, name: "Citizen Systems") }
     /// Magellan
-     class var magellan: Manufacturer { return Manufacturer(id: 37, name: "Magellan") }
+    class var magellan: Manufacturer { return Manufacturer(id: 37, name: "Magellan") }
     /// Osynce
-     class var osynce: Manufacturer { return Manufacturer(id: 38, name: "Osynce") }
+    class var osynce: Manufacturer { return Manufacturer(id: 38, name: "Osynce") }
     /// Holux
-     class var holux: Manufacturer { return Manufacturer(id: 39, name: "Holux") }
+    class var holux: Manufacturer { return Manufacturer(id: 39, name: "Holux") }
     /// Concept2
-     class var concept2: Manufacturer { return Manufacturer(id: 40, name: "Concept2") }
-
+    class var concept2: Manufacturer { return Manufacturer(id: 40, name: "Concept2") }
+    
     // 41 Left Blank
-
+    
     /// One Giant Leap
-     class var oneGiantLeap: Manufacturer { return Manufacturer(id: 42, name: "One Giant Leap") }
+    class var oneGiantLeap: Manufacturer { return Manufacturer(id: 42, name: "One Giant Leap") }
     /// Ace Sensor
-     class var aceSensor: Manufacturer { return Manufacturer(id: 43, name: "Ace Sensor") }
+    class var aceSensor: Manufacturer { return Manufacturer(id: 43, name: "Ace Sensor") }
     /// Brim Brothers
-     class var brimBrothers: Manufacturer { return Manufacturer(id: 44, name: "Brim Brothers") }
+    class var brimBrothers: Manufacturer { return Manufacturer(id: 44, name: "Brim Brothers") }
     /// Xplova
-     class var xplova: Manufacturer { return Manufacturer(id: 45, name: "Xplova") }
+    class var xplova: Manufacturer { return Manufacturer(id: 45, name: "Xplova") }
     /// Perception Digital
-     class var perceptionDigital: Manufacturer { return Manufacturer(id: 46, name: "Perception Digital") }
+    class var perceptionDigital: Manufacturer { return Manufacturer(id: 46, name: "Perception Digital") }
     /// bf1systems Ltd
-     class var bf1Systems: Manufacturer { return Manufacturer(id: 47, name: "bf1systems Ltd") }
+    class var bf1Systems: Manufacturer { return Manufacturer(id: 47, name: "bf1systems Ltd") }
     /// Pioneer
-     class var pioneer: Manufacturer { return Manufacturer(id: 48, name: "Pioneer") }
+    class var pioneer: Manufacturer { return Manufacturer(id: 48, name: "Pioneer") }
     /// Spantec
-     class var spantec: Manufacturer { return Manufacturer(id: 49, name: "Spantec") }
+    class var spantec: Manufacturer { return Manufacturer(id: 49, name: "Spantec") }
     /// Metalogics
-     class var metalogics: Manufacturer { return Manufacturer(id: 50, name: "Metalogics") }
+    class var metalogics: Manufacturer { return Manufacturer(id: 50, name: "Metalogics") }
     /// 4IIII Innovations Inc.
-     class var fouriii: Manufacturer { return Manufacturer(id: 51, name: "4IIII Innovations Inc.") }
+    class var fouriii: Manufacturer { return Manufacturer(id: 51, name: "4IIII Innovations Inc.") }
     /// Seiko Epson
-     class var seikoEpson: Manufacturer { return Manufacturer(id: 52, name: "Seiko Epson") }
+    class var seikoEpson: Manufacturer { return Manufacturer(id: 52, name: "Seiko Epson") }
     /// Seiko Epson OEM
-     class var seikoEpsonOem: Manufacturer { return Manufacturer(id: 53, name: "Seiko Epson OEM") }
+    class var seikoEpsonOem: Manufacturer { return Manufacturer(id: 53, name: "Seiko Epson OEM") }
     /// IFor Powell
-     class var iForPowell: Manufacturer { return Manufacturer(id: 54, name: "IFor Powell") }
+    class var iForPowell: Manufacturer { return Manufacturer(id: 54, name: "IFor Powell") }
     /// Maxwell Guider
-     class var maxwellGuider: Manufacturer { return Manufacturer(id: 55, name: "Maxwell Guider") }
+    class var maxwellGuider: Manufacturer { return Manufacturer(id: 55, name: "Maxwell Guider") }
     /// Star Trac
-     class var starTrac: Manufacturer { return Manufacturer(id: 56, name: "Star Trac") }
+    class var starTrac: Manufacturer { return Manufacturer(id: 56, name: "Star Trac") }
     /// Breakaway
-     class var breakaway: Manufacturer { return Manufacturer(id: 57, name: "Breakaway") }
+    class var breakaway: Manufacturer { return Manufacturer(id: 57, name: "Breakaway") }
     /// Alatech Technology LTD.
-     class var alatechTechnology: Manufacturer { return Manufacturer(id: 58, name: "Alatech Technology LTD.") }
+    class var alatechTechnology: Manufacturer { return Manufacturer(id: 58, name: "Alatech Technology LTD.") }
     /// MIO Technology Europe
-     class var mioTechnologyEurope: Manufacturer { return Manufacturer(id: 59, name: "MIO Technology Europe") }
+    class var mioTechnologyEurope: Manufacturer { return Manufacturer(id: 59, name: "MIO Technology Europe") }
     /// Rotor
-     class var rotor: Manufacturer { return Manufacturer(id: 60, name: "Rotor") }
+    class var rotor: Manufacturer { return Manufacturer(id: 60, name: "Rotor") }
     /// Geonaute
-     class var geonaute: Manufacturer { return Manufacturer(id: 61, name: "Geonaute") }
+    class var geonaute: Manufacturer { return Manufacturer(id: 61, name: "Geonaute") }
     /// ID Bike
-     class var idBike: Manufacturer { return Manufacturer(id: 62, name: "ID Bike") }
+    class var idBike: Manufacturer { return Manufacturer(id: 62, name: "ID Bike") }
     /// Specialized
-     class var specialized: Manufacturer { return Manufacturer(id: 63, name: "Specialized") }
+    class var specialized: Manufacturer { return Manufacturer(id: 63, name: "Specialized") }
     /// WTek
-     class var wTek: Manufacturer { return Manufacturer(id: 64, name: "WTek") }
+    class var wTek: Manufacturer { return Manufacturer(id: 64, name: "WTek") }
     /// Physical Enterprises
-     class var physicalEnterprises: Manufacturer { return Manufacturer(id: 65, name: "Physical Enterprises") }
+    class var physicalEnterprises: Manufacturer { return Manufacturer(id: 65, name: "Physical Enterprises") }
     /// North Pole Engineering
-     class var northPoleEngineering: Manufacturer { return Manufacturer(id: 66, name: "North Pole Engineering") }
+    class var northPoleEngineering: Manufacturer { return Manufacturer(id: 66, name: "North Pole Engineering") }
     /// BKool
-     class var bKool: Manufacturer { return Manufacturer(id: 67, name: "BKool") }
+    class var bKool: Manufacturer { return Manufacturer(id: 67, name: "BKool") }
     /// Cateye
-     class var cateye: Manufacturer { return Manufacturer(id: 68, name: "Cateye") }
+    class var cateye: Manufacturer { return Manufacturer(id: 68, name: "Cateye") }
     /// Stages Cycling
-     class var stagesCycling: Manufacturer { return Manufacturer(id: 69, name: "Stages Cycling") }
+    class var stagesCycling: Manufacturer { return Manufacturer(id: 69, name: "Stages Cycling") }
     /// SIGMA SPORT
-     class var sigmaSport: Manufacturer { return Manufacturer(id: 70, name: "SIGMA SPORT") }
+    class var sigmaSport: Manufacturer { return Manufacturer(id: 70, name: "SIGMA SPORT") }
     /// Tom Tom
-     class var tomTom: Manufacturer { return Manufacturer(id: 71, name: "Tom Tom") }
+    class var tomTom: Manufacturer { return Manufacturer(id: 71, name: "Tom Tom") }
     /// Peripedal
-     class var peripedal: Manufacturer { return Manufacturer(id: 72, name: "Peripedal") }
+    class var peripedal: Manufacturer { return Manufacturer(id: 72, name: "Peripedal") }
     /// Wattbike
-     class var wattBike: Manufacturer { return Manufacturer(id: 73, name: "Wattbike") }
-
+    class var wattBike: Manufacturer { return Manufacturer(id: 73, name: "Wattbike") }
+    
     // 74-75 NOT ASSIGNED
-
+    
     /// MOXY
-     class var moxy: Manufacturer { return Manufacturer(id: 76, name: "MOXY") }
+    class var moxy: Manufacturer { return Manufacturer(id: 76, name: "MOXY") }
     /// CicloSport
-     class var cicloSport: Manufacturer { return Manufacturer(id: 77, name: "CicloSport") }
+    class var cicloSport: Manufacturer { return Manufacturer(id: 77, name: "CicloSport") }
     /// POWERbahn
-     class var powerBahn: Manufacturer { return Manufacturer(id: 78, name: "POWERbahn") }
+    class var powerBahn: Manufacturer { return Manufacturer(id: 78, name: "POWERbahn") }
     /// Acorn Project Aps.
-     class var acornProjectAps: Manufacturer { return Manufacturer(id: 79, name: "Acorn Project Aps.") }
+    class var acornProjectAps: Manufacturer { return Manufacturer(id: 79, name: "Acorn Project Aps.") }
     /// LifeBEAM
-     class var lifeBeam: Manufacturer { return Manufacturer(id: 80, name: "LifeBEAM") }
+    class var lifeBeam: Manufacturer { return Manufacturer(id: 80, name: "LifeBEAM") }
     /// Bontrager
-     class var bontrager: Manufacturer { return Manufacturer(id: 81, name: "Bontrager") }
+    class var bontrager: Manufacturer { return Manufacturer(id: 81, name: "Bontrager") }
     /// Wellgo
-     class var wellgo: Manufacturer { return Manufacturer(id: 82, name: "Wellgo") }
+    class var wellgo: Manufacturer { return Manufacturer(id: 82, name: "Wellgo") }
     /// Scosche
-     class var scosche: Manufacturer { return Manufacturer(id: 83, name: "Scosche") }
+    class var scosche: Manufacturer { return Manufacturer(id: 83, name: "Scosche") }
     /// MAGURA
-     class var magura: Manufacturer { return Manufacturer(id: 84, name: "MAGURA") }
+    class var magura: Manufacturer { return Manufacturer(id: 84, name: "MAGURA") }
     /// Woodway
-     class var woodway: Manufacturer { return Manufacturer(id: 85, name: "Woodway") }
+    class var woodway: Manufacturer { return Manufacturer(id: 85, name: "Woodway") }
     /// Elite
-     class var elite: Manufacturer { return Manufacturer(id: 86, name: "Elite") }
+    class var elite: Manufacturer { return Manufacturer(id: 86, name: "Elite") }
     /// Nielsen-Kellerman
-     class var nielsenKellerman: Manufacturer { return Manufacturer(id: 87, name: "Nielsen-Kellerman") }
+    class var nielsenKellerman: Manufacturer { return Manufacturer(id: 87, name: "Nielsen-Kellerman") }
     /// DK City
-     class var dkCity: Manufacturer { return Manufacturer(id: 88, name: "DK City") }
+    class var dkCity: Manufacturer { return Manufacturer(id: 88, name: "DK City") }
     /// Tacx
-     class var tacx: Manufacturer { return Manufacturer(id: 89, name: "Tacx") }
+    class var tacx: Manufacturer { return Manufacturer(id: 89, name: "Tacx") }
     /// Direction Technology
-     class var directionTechnology: Manufacturer { return Manufacturer(id: 90, name: "Direction Technology") }
+    class var directionTechnology: Manufacturer { return Manufacturer(id: 90, name: "Direction Technology") }
     /// Magtonic
-     class var magtonic: Manufacturer { return Manufacturer(id: 91, name: "Magtonic") }
+    class var magtonic: Manufacturer { return Manufacturer(id: 91, name: "Magtonic") }
     /// 1partCarbon Inc.
-     class var onePartCarbon: Manufacturer { return Manufacturer(id: 92, name: "1partCarbon Inc.") }
+    class var onePartCarbon: Manufacturer { return Manufacturer(id: 92, name: "1partCarbon Inc.") }
     /// Inside Ride
-     class var insideRide: Manufacturer { return Manufacturer(id: 93, name: "Inside Ride") }
+    class var insideRide: Manufacturer { return Manufacturer(id: 93, name: "Inside Ride") }
     /// Sound Of Motion
-     class var soundOfMotion: Manufacturer { return Manufacturer(id: 94, name: "Sound Of Motion") }
+    class var soundOfMotion: Manufacturer { return Manufacturer(id: 94, name: "Sound Of Motion") }
     /// Stryd
-     class var stryd: Manufacturer { return Manufacturer(id: 95, name: "Stryd") }
+    class var stryd: Manufacturer { return Manufacturer(id: 95, name: "Stryd") }
     /// Indoor Cycling Group
-     class var indoorCyclingGroup: Manufacturer { return Manufacturer(id: 96, name: "Indoor Cycling Group") }
+    class var indoorCyclingGroup: Manufacturer { return Manufacturer(id: 96, name: "Indoor Cycling Group") }
     /// Mi Pulse
-     class var miPulse: Manufacturer { return Manufacturer(id: 97, name: "Mi Pulse") }
+    class var miPulse: Manufacturer { return Manufacturer(id: 97, name: "Mi Pulse") }
     /// BSX Athletics
-     class var bsxAthletics: Manufacturer { return Manufacturer(id: 98, name: "BSX Athletics") }
+    class var bsxAthletics: Manufacturer { return Manufacturer(id: 98, name: "BSX Athletics") }
     /// Look
-     class var look: Manufacturer { return Manufacturer(id: 99, name: "Look") }
+    class var look: Manufacturer { return Manufacturer(id: 99, name: "Look") }
     /// Campagnolo Srl
-     class var campagnolo: Manufacturer { return Manufacturer(id: 100, name: "Campagnolo Srl") }
+    class var campagnolo: Manufacturer { return Manufacturer(id: 100, name: "Campagnolo Srl") }
     /// Body Bike Smart
-     class var bodyBikeSmart: Manufacturer { return Manufacturer(id: 101, name: "Body Bike Smart") }
+    class var bodyBikeSmart: Manufacturer { return Manufacturer(id: 101, name: "Body Bike Smart") }
     /// Praxisworks
-     class var praxisworks: Manufacturer { return Manufacturer(id: 102, name: "Praxisworks") }
+    class var praxisworks: Manufacturer { return Manufacturer(id: 102, name: "Praxisworks") }
     /// Limits Technology
-     class var limitsTechnology: Manufacturer { return Manufacturer(id: 103, name: "Limits Technology") }
+    class var limitsTechnology: Manufacturer { return Manufacturer(id: 103, name: "Limits Technology") }
     /// TopAction Technology
-     class var topActionTechnology: Manufacturer { return Manufacturer(id: 104, name: "TopAction Technology") }
+    class var topActionTechnology: Manufacturer { return Manufacturer(id: 104, name: "TopAction Technology") }
     /// Cosinuss
-     class var cosinuss: Manufacturer { return Manufacturer(id: 105, name: "Cosinuss") }
+    class var cosinuss: Manufacturer { return Manufacturer(id: 105, name: "Cosinuss") }
     /// Fitcare
-     class var fitCare: Manufacturer { return Manufacturer(id: 106, name: "Fitcare") }
+    class var fitCare: Manufacturer { return Manufacturer(id: 106, name: "Fitcare") }
     /// Magene
-     class var magene: Manufacturer { return Manufacturer(id: 107, name: "Magene") }
+    class var magene: Manufacturer { return Manufacturer(id: 107, name: "Magene") }
     /// Giant Manufacturing Co
-     class var giantManufacturing: Manufacturer { return Manufacturer(id: 108, name: "Giant Manufacturing Co") }
+    class var giantManufacturing: Manufacturer { return Manufacturer(id: 108, name: "Giant Manufacturing Co") }
     /// TiGRA Sport
-     class var tigraSport: Manufacturer { return Manufacturer(id: 109, name: "TiGRA Sport") }
+    class var tigraSport: Manufacturer { return Manufacturer(id: 109, name: "TiGRA Sport") }
     /// Salutron
-     class var salutron: Manufacturer { return Manufacturer(id: 110, name: "Salutron") }
+    class var salutron: Manufacturer { return Manufacturer(id: 110, name: "Salutron") }
     /// TechnoGym
-     class var technogym: Manufacturer { return Manufacturer(id: 111, name: "TechnoGym") }
+    class var technogym: Manufacturer { return Manufacturer(id: 111, name: "TechnoGym") }
     /// Bryton Sensors
-     class var brytonSensors: Manufacturer { return Manufacturer(id: 112, name: "Bryton Sensors") }
+    class var brytonSensors: Manufacturer { return Manufacturer(id: 112, name: "Bryton Sensors") }
     /// Latitude Limited
-     class var latitudeLimited: Manufacturer { return Manufacturer(id: 113, name: "Latitude Limited") }
+    class var latitudeLimited: Manufacturer { return Manufacturer(id: 113, name: "Latitude Limited") }
     /// Soaring Technology
-     class var soaringTechnology: Manufacturer { return Manufacturer(id: 114, name: "Soaring Technology") }
+    class var soaringTechnology: Manufacturer { return Manufacturer(id: 114, name: "Soaring Technology") }
     /// IGP Sport
-     class var igpSport: Manufacturer { return Manufacturer(id: 115, name: "IGP Sport") }
+    class var igpSport: Manufacturer { return Manufacturer(id: 115, name: "IGP Sport") }
     /// Think Rider
-     class var thinkRider: Manufacturer { return Manufacturer(id: 116, name: "Think Rider") }
+    class var thinkRider: Manufacturer { return Manufacturer(id: 116, name: "Think Rider") }
     /// Gopher Sport
-     class var gopherSport: Manufacturer { return Manufacturer(id: 117, name: "Gopher Sport") }
+    class var gopherSport: Manufacturer { return Manufacturer(id: 117, name: "Gopher Sport") }
     /// Water Rower
-     class var waterRower: Manufacturer { return Manufacturer(id: 118, name: "Water Rower") }
+    class var waterRower: Manufacturer { return Manufacturer(id: 118, name: "Water Rower") }
     /// Orange Theory
-     class var orangeTheory: Manufacturer { return Manufacturer(id: 119, name: "Orange Theory") }
+    class var orangeTheory: Manufacturer { return Manufacturer(id: 119, name: "Orange Theory") }
     /// Inpeak
-     class var inpeak: Manufacturer { return Manufacturer(id: 120, name: "Inpeak") }
+    class var inpeak: Manufacturer { return Manufacturer(id: 120, name: "Inpeak") }
     /// Kinetic
-     class var kinetic: Manufacturer { return Manufacturer(id: 121, name: "Kinetic") }
+    class var kinetic: Manufacturer { return Manufacturer(id: 121, name: "Kinetic") }
     /// Johnson Health Tech
-     class var johnsonHealthTech: Manufacturer { return Manufacturer(id: 122, name: "Johnson Health Tech") }
+    class var johnsonHealthTech: Manufacturer { return Manufacturer(id: 122, name: "Johnson Health Tech") }
     /// Polar Electro
-     class var polarElectro: Manufacturer { return Manufacturer(id: 123, name: "Polar Electro") }
+    class var polarElectro: Manufacturer { return Manufacturer(id: 123, name: "Polar Electro") }
     /// SeeSense
-     class var seeSense: Manufacturer { return Manufacturer(id: 124, name: "SeeSense") }
-
+    class var seeSense: Manufacturer { return Manufacturer(id: 124, name: "SeeSense") }
+    
     //125-254 NOT ASSIGNED
     //256 NOT ASSIGNED
-
+    
     /// Health and Life
-     class var healthAndLife: Manufacturer { return Manufacturer(id: 257, name: "Health and Life") }
+    class var healthAndLife: Manufacturer { return Manufacturer(id: 257, name: "Health and Life") }
     /// Lezyne
-     class var lezyne: Manufacturer { return Manufacturer(id: 258, name: "Lezyne") }
+    class var lezyne: Manufacturer { return Manufacturer(id: 258, name: "Lezyne") }
     /// Scribe Labs
-     class var scribeLabs: Manufacturer { return Manufacturer(id: 259, name: "Scribe Labs") }
+    class var scribeLabs: Manufacturer { return Manufacturer(id: 259, name: "Scribe Labs") }
     /// Zwift
-     class var zwift: Manufacturer { return Manufacturer(id: 260, name: "Zwift") }
+    class var zwift: Manufacturer { return Manufacturer(id: 260, name: "Zwift") }
     /// Watteam
-     class var watteam: Manufacturer { return Manufacturer(id: 261, name: "Watteam") }
+    class var watteam: Manufacturer { return Manufacturer(id: 261, name: "Watteam") }
     /// Recon
-     class var recon: Manufacturer { return Manufacturer(id: 262, name: "Recon") }
+    class var recon: Manufacturer { return Manufacturer(id: 262, name: "Recon") }
     /// Favero Electronics
-     class var faveroElectronics: Manufacturer { return Manufacturer(id: 263, name: "Favero Electronics") }
+    class var faveroElectronics: Manufacturer { return Manufacturer(id: 263, name: "Favero Electronics") }
     /// Dyno Velo
-     class var dynoVelo: Manufacturer { return Manufacturer(id: 264, name: "Dyno Velo") }
+    class var dynoVelo: Manufacturer { return Manufacturer(id: 264, name: "Dyno Velo") }
     /// Strava
-     class var strava: Manufacturer { return Manufacturer(id: 265, name: "Strava") }
+    class var strava: Manufacturer { return Manufacturer(id: 265, name: "Strava") }
     /// Precor
-     class var precore: Manufacturer { return Manufacturer(id: 266, name: "Precor") }
+    class var precore: Manufacturer { return Manufacturer(id: 266, name: "Precor") }
     /// Bryton
-     class var byrton: Manufacturer { return Manufacturer(id: 267, name: "Bryton") }
+    class var byrton: Manufacturer { return Manufacturer(id: 267, name: "Bryton") }
     /// SRAM
-     class var sram: Manufacturer { return Manufacturer(id: 268, name: "SRAM") }
+    class var sram: Manufacturer { return Manufacturer(id: 268, name: "SRAM") }
     /// Mio Technology
-     class var mioTechnology: Manufacturer { return Manufacturer(id: 269, name: "Mio Technology") }
+    class var mioTechnology: Manufacturer { return Manufacturer(id: 269, name: "Mio Technology") }
     /// COBI GmbH
-     class var cobi: Manufacturer { return Manufacturer(id: 270, name: "COBI GmbH") }
+    class var cobi: Manufacturer { return Manufacturer(id: 270, name: "COBI GmbH") }
     /// Spivi
-     class var spivi: Manufacturer { return Manufacturer(id: 271, name: "Spivi") }
+    class var spivi: Manufacturer { return Manufacturer(id: 271, name: "Spivi") }
     /// Mio Magellan
-     class var mioMagellan: Manufacturer { return Manufacturer(id: 272, name: "Mio Magellan") }
+    class var mioMagellan: Manufacturer { return Manufacturer(id: 272, name: "Mio Magellan") }
     /// Evesports
-     class var eveSports: Manufacturer { return Manufacturer(id: 273, name: "Evesports") }
+    class var eveSports: Manufacturer { return Manufacturer(id: 273, name: "Evesports") }
     /// Sensitivus Gauge
-     class var sensitivusGauge: Manufacturer { return Manufacturer(id: 274, name: "Sensitivus Gauge") }
+    class var sensitivusGauge: Manufacturer { return Manufacturer(id: 274, name: "Sensitivus Gauge") }
     /// Podoon
-     class var podoon: Manufacturer { return Manufacturer(id: 275, name: "Podoon") }
+    class var podoon: Manufacturer { return Manufacturer(id: 275, name: "Podoon") }
     /// Life Time Fitness
-     class var lifeTimeFitness: Manufacturer { return Manufacturer(id: 276, name: "Life Time Fitness") }
+    class var lifeTimeFitness: Manufacturer { return Manufacturer(id: 276, name: "Life Time Fitness") }
     /// Falco eMotors Inc.
-     class var falcoEMotors: Manufacturer { return Manufacturer(id: 277, name: "Falco eMotors Inc.") }
+    class var falcoEMotors: Manufacturer { return Manufacturer(id: 277, name: "Falco eMotors Inc.") }
     /// Minoura
-     class var minoura: Manufacturer { return Manufacturer(id: 278, name: "Minoura") }
+    class var minoura: Manufacturer { return Manufacturer(id: 278, name: "Minoura") }
     /// Cycliq
-     class var cycliq: Manufacturer { return Manufacturer(id: 279, name: "Cycliq") }
+    class var cycliq: Manufacturer { return Manufacturer(id: 279, name: "Cycliq") }
     /// Luxxottica
-     class var luxottica: Manufacturer { return Manufacturer(id: 280, name: "Luxxottica") }
+    class var luxottica: Manufacturer { return Manufacturer(id: 280, name: "Luxxottica") }
     /// Trainer Road
-     class var trainerRoad: Manufacturer { return Manufacturer(id: 281, name: "Trainer Road") }
+    class var trainerRoad: Manufacturer { return Manufacturer(id: 281, name: "Trainer Road") }
     /// The Sufferfest
-     class var theSufferfest: Manufacturer { return Manufacturer(id: 282, name: "The Sufferfest") }
+    class var theSufferfest: Manufacturer { return Manufacturer(id: 282, name: "The Sufferfest") }
     /// Full Speed Ahead
-     class var fullSpeedAhead: Manufacturer { return Manufacturer(id: 283, name: "Full Speed Ahead") }
+    class var fullSpeedAhead: Manufacturer { return Manufacturer(id: 283, name: "Full Speed Ahead") }
     /// Virtual Training
-     class var virtualTraining: Manufacturer { return Manufacturer(id: 284, name: "Virtual Training") }
+    class var virtualTraining: Manufacturer { return Manufacturer(id: 284, name: "Virtual Training") }
     /// Feedback Sports
-     class var feedbackSports: Manufacturer { return Manufacturer(id: 285, name: "Feedback Sports") }
+    class var feedbackSports: Manufacturer { return Manufacturer(id: 285, name: "Feedback Sports") }
     /// Omata
-     class var omata: Manufacturer { return Manufacturer(id: 286, name: "Omata") }
+    class var omata: Manufacturer { return Manufacturer(id: 286, name: "Omata") }
     /// VDO
-     class var vdo: Manufacturer { return Manufacturer(id: 287, name: "VDO") }
+    class var vdo: Manufacturer { return Manufacturer(id: 287, name: "VDO") }
     /// Magnetic Days
-     class var magneticDays: Manufacturer { return Manufacturer(id: 288, name: "Magnetic Days") }
+    class var magneticDays: Manufacturer { return Manufacturer(id: 288, name: "Magnetic Days") }
     /// HammerHead
-     class var hammerHead: Manufacturer { return Manufacturer(id: 289, name: "HammerHead") }
+    class var hammerHead: Manufacturer { return Manufacturer(id: 289, name: "HammerHead") }
     /// Kinetic by Kurt
-     class var kineticByKurt: Manufacturer { return Manufacturer(id: 290, name: "Kinetic by Kurt") }
+    class var kineticByKurt: Manufacturer { return Manufacturer(id: 290, name: "Kinetic by Kurt") }
     /// ShapeLog
-     class var shapeLog: Manufacturer { return Manufacturer(id: 291, name: "ShapeLog") }
+    class var shapeLog: Manufacturer { return Manufacturer(id: 291, name: "ShapeLog") }
     /// Dabuziduo
-     class var dabuziduo: Manufacturer { return Manufacturer(id: 292, name: "Dabuziduo") }
+    class var dabuziduo: Manufacturer { return Manufacturer(id: 292, name: "Dabuziduo") }
     /// Jet Black
-     class var jetBlack: Manufacturer { return Manufacturer(id: 293, name: "Jet Black") }
+    class var jetBlack: Manufacturer { return Manufacturer(id: 293, name: "Jet Black") }
     /// Coros
-     class var coros: Manufacturer { return Manufacturer(id: 294, name: "Coros") }
+    class var coros: Manufacturer { return Manufacturer(id: 294, name: "Coros") }
     /// VirtuGo
-     class var virtugo: Manufacturer { return Manufacturer(id: 295, name: "VirtuGo") }
+    class var virtugo: Manufacturer { return Manufacturer(id: 295, name: "VirtuGo") }
     /// Velosense
-     class var velosense: Manufacturer { return Manufacturer(id: 296, name: "Velosense") }
+    class var velosense: Manufacturer { return Manufacturer(id: 296, name: "Velosense") }
     /// Cycligent Inc
-     class var cycligent: Manufacturer { return Manufacturer(id: 297, name: "Cycligent Inc") }
+    class var cycligent: Manufacturer { return Manufacturer(id: 297, name: "Cycligent Inc") }
     /// Trailforks
-     class var trailforks: Manufacturer { return Manufacturer(id: 298, name: "Trailforks") }
+    class var trailforks: Manufacturer { return Manufacturer(id: 298, name: "Trailforks") }
     /// Mahle E-BikeMotion
-     class var mahleEbikeMotion: Manufacturer { return Manufacturer(id: 299, name: "Mahle E-BikeMotion") }
+    class var mahleEbikeMotion: Manufacturer { return Manufacturer(id: 299, name: "Mahle E-BikeMotion") }
+    /// Nurvv
+    class var nurvv: Manufacturer { return Manufacturer(id: 300, name: "Nurvv") }
+    /// Microprogram
+    class var microprogram: Manufacturer { return Manufacturer(id: 301, name: "Microprogram") }
+    /// Zone 5 Cloud
+    class var zoneFiveCloud: Manufacturer { return Manufacturer(id: 302, name: "Zone 5 Cloud") }
+    /// Green Teg
+    class var greenTeg: Manufacturer { return Manufacturer(id: 303, name: "Green Teg") }
+    /// Yamaha Motors
+    class var yamahaMotors: Manufacturer { return Manufacturer(id: 304, name: "Yamaha Motors") }
+    /// Whoop
+    class var whoop: Manufacturer { return Manufacturer(id: 305, name: "Whoop") }
+    /// Gravaa
+    class var gravaa: Manufacturer { return Manufacturer(id: 306, name: "Gravaa") }
+    /// One Lap
+    class var onelap: Manufacturer { return Manufacturer(id: 307, name: "One Lap") }
+    /// Monark Exercise
+    class var monarkExercise: Manufacturer { return Manufacturer(id: 308, name: "Monark Exercise") }
+    /// Form
+    class var form: Manufacturer { return Manufacturer(id: 309, name: "Form") }
+    /// Decathlon
+    class var decathlon: Manufacturer { return Manufacturer(id: 310, name: "Decathlon") }
+    /// Syncros
+    class var syncros: Manufacturer { return Manufacturer(id: 311, name: "Syncros") }
+    /// Heat Up
+    class var heatUp: Manufacturer { return Manufacturer(id: 312, name: "Heat Up") }
+    /// Cannondale
+    class var cannondale: Manufacturer { return Manufacturer(id: 313, name: "Cannondale") }
+    /// True Fitness
+    class var trueFitness: Manufacturer { return Manufacturer(id: 314, name: "True Fitness") }
+    /// RGT Cycling
+    class var rgtCycling: Manufacturer { return Manufacturer(id: 315, name: "RGT Cycling") }
+    /// Vasa
+    class var vasa: Manufacturer { return Manufacturer(id: 316, name: "Vasa") }
+    /// Race Republic
+    class var raceRepublic: Manufacturer { return Manufacturer(id: 317, name: "Race Republic") }
+    /// Fazua
+    class var fazua: Manufacturer { return Manufacturer(id: 318, name: "Fazua") }
+    /// Oreka Training
+    class var orekaTraining: Manufacturer { return Manufacturer(id: 319, name: "Oreka Training") }
+    /// Lishun Electric & Communication
+    class var lsec: Manufacturer { return Manufacturer(id: 320, name: "Lishun Electric & Communication") }
+    /// Lululemon Studio
+    class var lululemonStudio: Manufacturer { return Manufacturer(id: 321, name: "Lululemon Studio") }
+    /// Shaynue
+    class var shaynue: Manufacturer { return Manufacturer(id: 322, name: "Shaynue") }
+    /// Spinning MDA
+    class var spinningMda: Manufacturer { return Manufacturer(id: 323, name: "Spinning MDA") }
+    /// Hill Dating
+    class var hilldating: Manufacturer { return Manufacturer(id: 324, name: "Hill Dating") }
 
     /// ActiGraph
-     class var actiGraph: Manufacturer { return Manufacturer(id: 5769, name: "ActiGraph") }
+    class var actiGraph: Manufacturer { return Manufacturer(id: 5769, name: "ActiGraph") }
 }
diff --git a/Sources/ANTMessageProtocol/Types/Manufacturer/ManufacturerSupported.swift b/Sources/ANTMessageProtocol/Types/Manufacturer/ManufacturerSupported.swift
index da9982e..4263ae4 100644
--- a/Sources/ANTMessageProtocol/Types/Manufacturer/ManufacturerSupported.swift
+++ b/Sources/ANTMessageProtocol/Types/Manufacturer/ManufacturerSupported.swift
@@ -196,6 +196,31 @@ public extension Manufacturer {
         allManufacturers.append(.cycligent)
         allManufacturers.append(.trailforks)
         allManufacturers.append(.mahleEbikeMotion)
+        allManufacturers.append(.nurvv)
+        allManufacturers.append(.microprogram)
+        allManufacturers.append(.zoneFiveCloud)
+        allManufacturers.append(.greenTeg)
+        allManufacturers.append(.yamahaMotors)
+        allManufacturers.append(.whoop)
+        allManufacturers.append(.gravaa)
+        allManufacturers.append(.onelap)
+        allManufacturers.append(.monarkExercise)
+        allManufacturers.append(.form)
+        allManufacturers.append(.decathlon)
+        allManufacturers.append(.syncros)
+        allManufacturers.append(.heatUp)
+        allManufacturers.append(.cannondale)
+        allManufacturers.append(.trueFitness)
+        allManufacturers.append(.rgtCycling)
+        allManufacturers.append(.vasa)
+        allManufacturers.append(.raceRepublic)
+        allManufacturers.append(.fazua)
+        allManufacturers.append(.orekaTraining)
+        allManufacturers.append(.lsec)
+        allManufacturers.append(.lululemonStudio)
+        allManufacturers.append(.shaynue)
+        allManufacturers.append(.spinningMda)
+        allManufacturers.append(.hilldating)
 
         allManufacturers.append(.actiGraph)