         }
     }
     
-    func sendTurnOnRequest(actuator: Actuator, completion: (SmappeeRequestResult) -> Void) {
-        sendTurnOnRequest(actuator, duration: .Indefinitely, completion: completion)
-    }
-
-    func sendTurnOnRequest(actuator: Actuator, duration: SmappeeActuatorDuration, completion: (SmappeeRequestResult) -> Void) {
+    public func sendTurnOnRequest(actuator: Actuator, duration: SmappeeActuatorDuration = .Indefinitely, completion: (SmappeeRequestResult) -> Void) {
         sendActuatorRequest(actuator, on: true, duration: duration, completion: completion)
     }
     
-    func sendTurnOffRequest(actuator: Actuator, completion: (SmappeeRequestResult) -> Void) {
-        sendTurnOffRequest(actuator, duration: .Indefinitely, completion: completion)
-    }
-    
-    public func sendTurnOffRequest(actuator: Actuator, duration: SmappeeActuatorDuration, completion: (SmappeeRequestResult) -> Void) {
+    public func sendTurnOffRequest(actuator: Actuator, duration: SmappeeActuatorDuration = .Indefinitely, completion: (SmappeeRequestResult) -> Void) {
         sendActuatorRequest(actuator, on: false, duration: duration, completion: completion)
     }
     

        }
    }
    
    func sendConsumptionRequest(serviceLocation: ServiceLocation, from: NSDate, to: NSDate, aggregation: SmappeeAggregation, completion: Result<[Consumption], String> -> Void) {
        let endPoint = consumptionEndPoint(serviceLocation, from: from, to: to, aggregation: aggregation)
        let request = NSURLRequest.init(URL: NSURL.init(string: endPoint)!)
        SmappeeRequest(urlRequest: request, controller: self) { r in

    
    // MARK: API Methods
    
    public func sendServiceLocationRequest(completion: (Result<[ServiceLocation], String>) -> Void) {
        let request = NSURLRequest.init(URL: NSURL.init(string: serviceLocationEndPoint)!)
        SmappeeRequest(urlRequest: request, controller: self) { r in
            r.flatMap(self.parseServiceLocations, completion: completion)
        }
    }
    
    public func sendServiceLocationInfoRequest(serviceLocation: ServiceLocation, completion: ServiceLocationInfoRequestResult -> Void) {
        let endPoint = serviceLocationInfoEndPoint(serviceLocation)
        let request = NSURLRequest.init(URL: NSURL.init(string: endPoint)!)
        SmappeeRequest(urlRequest: request, controller: self) { r in
