@@ -42,7 +42,7 @@ public final class Map {
 		// save key and value associated to it
 		currentKey = key
 		// break down the components of the key
-		currentValue = valueFor(key.componentsSeparatedByString("."), JSONDictionary)
+		currentValue = valueFor(ArraySlice(split(key) { $0 == "." }), JSONDictionary)
 
 		return self
 	}
@@ -80,7 +80,7 @@ public final class Map {
 }
 
 /// Fetch value from JSON dictionary, loop through them until we reach the desired object.
-private func valueFor(keyPathComponents: [String], dictionary: [String : AnyObject]) -> AnyObject? {
+private func valueFor(keyPathComponents: ArraySlice<String>, dictionary: [String : AnyObject]) -> AnyObject? {
 	// Implement it as a tail recursive function.
 
 	if keyPathComponents.isEmpty {
@@ -93,7 +93,7 @@ private func valueFor(keyPathComponents: [String], dictionary: [String : AnyObje
 			return nil
 
 		case let dict as [String : AnyObject] where keyPathComponents.count > 1:
-			let tail = Array(keyPathComponents[1..<keyPathComponents.count])
+			let tail = dropFirst(keyPathComponents)
 			return valueFor(tail, dict)
 
 		default:
 
@@ -9,10 +9,10 @@
 import class Foundation.NSNumber
 
 private func setValue(value: AnyObject, forKey key: String, inout #dictionary: [String : AnyObject]) {
-	return setValue(value, forKeyPathComponents: key.componentsSeparatedByString("."), dictionary: &dictionary)
+	return setValue(value, forKeyPathComponents: ArraySlice(split(key) { $0 == "." }), dictionary: &dictionary)
 }
 
-private func setValue(value: AnyObject, forKeyPathComponents components: [String], inout #dictionary: [String : AnyObject]) {
+private func setValue(value: AnyObject, forKeyPathComponents components: ArraySlice<String>, inout #dictionary: [String : AnyObject]) {
 	if components.isEmpty {
 		return
 	}
@@ -27,7 +27,7 @@ private func setValue(value: AnyObject, forKeyPathComponents components: [String
 			child = [:]
 		}
 
-		let tail = Array(components[1..<components.count])
+		let tail = dropFirst(components)
 		setValue(value, forKeyPathComponents: tail, dictionary: &child!)
 
 		return dictionary[head] = child
Original file line number	Diff line number	Diff line change
`@@ -9,10 +9,10 @@`
`9`	`9`	`import class Foundation.NSNumber`
`10`	`10`
`11`	`11`	`private func setValue(value: AnyObject, forKey key: String, inout #dictionary: [String : AnyObject]) {`
`12`		`- return setValue(value, forKeyPathComponents: key.componentsSeparatedByString("."), dictionary: &dictionary)`
	`12`	`+ return setValue(value, forKeyPathComponents: ArraySlice(split(key) { $0 == "." }), dictionary: &dictionary)`
`13`	`13`	`}`
`14`	`14`
`15`		`-private func setValue(value: AnyObject, forKeyPathComponents components: [String], inout #dictionary: [String : AnyObject]) {`
	`15`	`+private func setValue(value: AnyObject, forKeyPathComponents components: ArraySlice<String>, inout #dictionary: [String : AnyObject]) {`
`16`	`16`	`if components.isEmpty {`
`17`	`17`	`return`
`18`	`18`	`}`
`@@ -27,7 +27,7 @@ private func setValue(value: AnyObject, forKeyPathComponents components: [String`
`27`	`27`	`child = [:]`
`28`	`28`	`}`
`29`	`29`
`30`		`- let tail = Array(components[1..<components.count])`
	`30`	`+ let tail = dropFirst(components)`
`31`	`31`	`setValue(value, forKeyPathComponents: tail, dictionary: &child!)`
`32`	`32`
`33`	`33`	`return dictionary[head] = child`