 
 extension OPRCKOperation where T: CKFetchNotificationChangesOperationType {
 
-    typealias FetchNotificationChangesChangedBlock = T.Notification -> Void
-    typealias FetchNotificationChangesCompletionBlock = T.ServerChangeToken? -> Void
-
-    var notificationChangedBlock: ((T.Notification) -> Void)? {
+    var notificationChangedBlock: CloudKitOperation<T>.FetchNotificationChangesChangedBlock? {
         get { return operation.notificationChangedBlock }
         set { operation.notificationChangedBlock = newValue }
     }
 
-    func setFetchNotificationChangesCompletionBlock(block: FetchNotificationChangesCompletionBlock) {
+    func setFetchNotificationChangesCompletionBlock(block: CloudKitOperation<T>.FetchNotificationChangesCompletionBlock) {
 
         operation.fetchNotificationChangesCompletionBlock = { [unowned target] token, error in
             if let error = error, target = target as? GroupOperation {

        set { operation.subscriptionIDsToDelete = newValue }
    }

    func setModifySubscriptionsCompletionBlock(block: ModifySubscriptionsCompletionBlock) {
        operation.modifySubscriptionsCompletionBlock = { [unowned target] saved, deleted, error in
            if let error = error, target = target as? GroupOperation {
                target.aggregateError(error)

        }
    }

    public func setFetchNotificationChangesCompletionBlock(block: CloudKitOperation<T>.FetchNotificationChangesCompletionBlock) {
        addConfigureBlock { $0.setFetchNotificationChangesCompletionBlock(block) }
    }
}
