             else { return nil }
         
         var index = 0
-        var addresses = [GAPTargetAddress]()
+        var addresses = [GAPAddress]()
         
         while index < data.count {
             
-            let address = GAPTargetAddress(companyAssigned: (data[index], data[index+1], data[index+2]), companyId: (data[index+3], data[index+4], data[index+5]))
+            let address = GAPAddress(companyAssigned: (data[index], data[index+1], data[index+2]), companyId: (data[index+3], data[index+4], data[index+5]))
             addresses.append(address)
             
             index += type(of: self).length

            else { return nil }
        
        var index = 0
        var addresses = [GAPTargetAddress]()
        
        while index < data.count {
            
            let address = GAPTargetAddress(companyAssigned: (data[index], data[index+1], data[index+2]), companyId: (data[index+3], data[index+4], data[index+5]))
            addresses.append(address)
            
            index += type(of: self).length

    
}

extension GAPAddress: Equatable {
    
    public static func == (lhs: GAPAddress, rhs: GAPAddress) -> Bool {
        
        return lhs.companyAssigned == rhs.companyAssigned && lhs.companyId == rhs.companyId
    }
