             
         case PropertyName.email.rawValue:
             var emailProperty = EmailProperty()
-            emailProperty.parameters = extractParameters(JSONParameters: property[PropertyIndex.Parameters.rawValue])
-            emailProperty.value = property[PropertyIndex.Value.rawValue].stringValue as AnyObject
+            emailProperty.parameters = extractParameters(JSONParameters: property[PropertyIndex.parameters.rawValue])
+            emailProperty.value = property[PropertyIndex.value.rawValue].stringValue as AnyObject
             emails.append(emailProperty)
             
         case PropertyName.title.rawValue:
             var titleProperty = TitleProperty()
-            titleProperty.value = property[PropertyIndex.Value.rawValue].stringValue as AnyObject
+            titleProperty.value = property[PropertyIndex.value.rawValue].stringValue as AnyObject
             card.title = titleProperty
             
         case PropertyName.URL.rawValue:
             var urlProperty = URLProperty()
-            urlProperty.parameters = extractParameters(JSONParameters: property[PropertyIndex.Parameters.rawValue])
-            urlProperty.value = property[PropertyIndex.Value.rawValue].stringValue as AnyObject
+            urlProperty.parameters = extractParameters(JSONParameters: property[PropertyIndex.parameters.rawValue])
+            urlProperty.value = property[PropertyIndex.value.rawValue].stringValue as AnyObject
             urls.append(urlProperty)
             
         case PropertyName.organization.rawValue:
             var orgProperty = OrgProperty()
             
-            let orgValues = property[PropertyIndex.Value.rawValue]
+            let orgValues = property[PropertyIndex.value.rawValue]
             if let orgType = orgValues.type as? String {
                 orgProperty.value = [orgValues.stringValue]
             }

            
        case PropertyName.telephone.rawValue:
            var telProperty = TelProperty()
            telProperty.parameters = extractParameters(JSONParameters: property[PropertyIndex.Parameters.rawValue])
            let value = property[PropertyIndex.Value.rawValue].stringValue
            
            // TODO: Do some tel: URL processing
            telProperty.value = value as AnyObject

            // property type set as "date" - with or without a year present.
            // So for the time being, let's only parse the "date" type for bday.
            // TODO: Check that the type is "date" and reject others for now
            let birthdayValue = property[PropertyIndex.value.rawValue].stringValue
            print("bday value = \(birthdayValue)")
            let birthdayComponents = parseBirthday(value: birthdayValue)
            let birthdayProperty = BirthdayProperty(birthday: birthdayComponents, valueType: DatePropertyValueType.date)
