36 changed files with 351 additions and 1222 deletions
--- a/.swift-version
+++ b/.swift-version
@ -1 +1 @@
-5.7
+3.0
--- a/.travis.yml
+++ b/.travis.yml
@ -1,5 +1,5 @@
 language: objective-c
-osx_image: xcode11
+osx_image: xcode8
 branches:
  only:
  - master
@ -7,18 +7,20 @@ env:
  global:
  - LC_CTYPE=en_US.UTF-8
  - LANG=en_US.UTF-8
-  - IOS_SDK=iphonesimulator13.0
+  - IOS_SDK=iphonesimulator10.0
  - SCHEME_IOS="TableKit"
  - PROJECT_FRAMEWORK="TableKit.xcodeproj"

  matrix:
-  - DESTINATION="OS=10.3.1,name=iPhone 5"        SCHEME="$SCHEME_IOS"     SDK="$IOS_SDK"
-  - DESTINATION="OS=11.1,name=iPhone 6"          SCHEME="$SCHEME_IOS"     SDK="$IOS_SDK"
-  - DESTINATION="OS=12.0,name=iPhone 7 Plus"     SCHEME="$SCHEME_IOS"     SDK="$IOS_SDK"
-  - DESTINATION="OS=13.0,name=iPhone 11"         SCHEME="$SCHEME_IOS"     SDK="$IOS_SDK"
+  - DESTINATION="OS=9.0,name=iPhone 6"           SCHEME="$SCHEME_IOS"     SDK="$IOS_SDK"
+  - DESTINATION="OS=9.1,name=iPhone 6 Plus"      SCHEME="$SCHEME_IOS"     SDK="$IOS_SDK"
+  - DESTINATION="OS=9.2,name=iPhone 6S"          SCHEME="$SCHEME_IOS"     SDK="$IOS_SDK"
+  - DESTINATION="OS=9.3,name=iPhone 6S Plus"     SCHEME="$SCHEME_IOS"     SDK="$IOS_SDK"
+  - DESTINATION="OS=10.0,name=iPhone 5"          SCHEME="$SCHEME_IOS"     SDK="$IOS_SDK"
+  - DESTINATION="OS=10.0,name=iPhone 7 Plus"     SCHEME="$SCHEME_IOS"     SDK="$IOS_SDK"

 script:
  - set -o pipefail
  - xcodebuild -version
  - xcodebuild -showsdks
-  - xcodebuild -project "$PROJECT_FRAMEWORK" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO test
+  - xcodebuild -project "$PROJECT_FRAMEWORK" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test | xcpretty;
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,55 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-
-## [2.10.0](https://github.com/maxsokolov/TableKit/releases/tag/2.10.0)
-Released on 2019-09-29.
- Swift 5.1 support.
-
-## [2.9.0](https://github.com/maxsokolov/TableKit/releases/tag/2.9.0)
-Released on 2019-04-04.
- Swift 5.0 support.
-
-## [2.8.0](https://github.com/maxsokolov/TableKit/releases/tag/2.8.0)
-Released on 2018-09-30.
- Swift 4.2 support.
-
-## [2.5.0](https://github.com/maxsokolov/TableKit/releases/tag/2.5.0)
-Released on 2017-09-24.
- Swift 4.0 support.
-
-## [2.3.0](https://github.com/maxsokolov/TableKit/releases/tag/2.3.0)
-Released on 2016-11-16.
- `shouldUsePrototypeCellHeightCalculation` moved to `TableDirector(tableView: tableView, shouldUsePrototypeCellHeightCalculation: true)`
- Prototype cell height calculation bugfixes
-
-## [2.1.0](https://github.com/maxsokolov/TableKit/releases/tag/2.1.0)
-Released on 2016-10-19.
- `action` method was deprecated on TableRow. Use `on` instead.
- Support multiple actions with same type on row.
- You could now build your own cell height calculating strategy. See [TablePrototypeCellHeightCalculator](Sources/TablePrototypeCellHeightCalculator.swift).
- Default distance between sections changed to `UITableViewAutomaticDimension`. You can customize it, see [TableSection](Sources/TableSection.swift)
-
-## [2.0.0](https://github.com/maxsokolov/TableKit/releases/tag/2.0.0)
-Released on 2016-10-06. Breaking changes in 2.0.0:
-<br/>The signatures of `TableRow` and `TableRowAction` classes were changed from
-```swift
-let action = TableRowAction<String, StringTableViewCell>(.click) { (data) in
-}
-
-let row = TableRow<String, StringTableViewCell>(item: "some string", actions: [action])
-```
-to
-```swift
-let action = TableRowAction<StringTableViewCell>(.click) { (data) in
-}
-
-let row = TableRow<StringTableViewCell>(item: "some string", actions: [action])
-```
-This is the great improvement that comes from the community. Thanks a lot!
-
-## [1.3.0](https://github.com/maxsokolov/TableKit/releases/tag/1.3.0)
-Released on 2016-09-04. Swift 3.0 support.
-
-## [0.1.0](https://github.com/maxsokolov/TableKit/releases/tag/0.1.0)
-Released on 2015-11-15. Initial release called Tablet.
--- a/Demo/Classes/Application/AppDelegate.swift
+++ b/Demo/Classes/Application/AppDelegate.swift
@ -1,7 +1,15 @@
+//
+//  AppDelegate.swift
+//  TabletDemo
+//
+//  Created by Max Sokolov on 08/11/15.
+//  Copyright © 2015 Tablet. All rights reserved.
+//
+
 import UIKit

@UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {

    var window: UIWindow?
-}
+}
--- a/Demo/Classes/Presentation/Controllers/AutolayoutCellsController.swift
+++ b/Demo/Classes/Presentation/Controllers/AutolayoutCellsController.swift
@ -1,3 +1,11 @@
+//
+//  AutolayoutCellsController.swift
+//  TableKitDemo
+//
+//  Created by Max Sokolov on 18/06/16.
+//  Copyright © 2016 Tablet. All rights reserved.
+//
+
 import UIKit
 import TableKit

@ -5,66 +13,27 @@ class AutolayoutCellsController: UIViewController {
    
    @IBOutlet weak var tableView: UITableView! {
        didSet {
-            tableDirector = TableDirector(tableView: tableView, shouldUsePrototypeCellHeightCalculation: true)
+            tableDirector = TableDirector(tableView: tableView)
+            tableDirector.shouldUsePrototypeCellHeightCalculation = true
        }
    }
    var tableDirector: TableDirector!
    
-    func randomString(length: Int) -> String {
-        
-        let letters : NSString = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
-        let len = UInt32(letters.length)
-        
-        var randomString = ""
-        
-        for _ in 0 ..< length {
-            let rand = arc4random_uniform(len)
-            var nextChar = letters.character(at: Int(rand))
-            randomString += NSString(characters: &nextChar, length: 1) as String
-        }
-        
-        return randomString
-    }
-    
-    func randomInt(min: Int, max:Int) -> Int {
-        return min + Int(arc4random_uniform(UInt32(max - min + 1)))
-    }
-    
    override func viewDidLoad() {
        super.viewDidLoad()
        
        title = "Autolayout cells"
        
-        let header = AutolayoutSectionHeaderView.loadFromNib()
-        let section = TableSection(headerView: header, footerView: nil)
-        section.headerHeight = getViewHeight(view: header, width: UIScreen.main.bounds.width)
+        let section = TableSection()
        
        var rows = 0
-        while rows <= 20 {
+        while rows <= 1000 {
            rows += 1
            
-            let row = TableRow<AutolayoutTableViewCell>(item: randomString(length: randomInt(min: 20, max: 100)))
+            let row = TableRow<Void, AutolayoutTableViewCell>(item: ())
            section += row
        }
        
        tableDirector += section
-        
-        navigationItem.rightBarButtonItem = UIBarButtonItem(title: "Clear", style: .done, target: self, action: #selector(clear))
    }
-    
-    @objc
-    func clear() {
-        
-        tableDirector.clear()
-        tableDirector.reload()
-    }
-    
-    func getViewHeight(view: UIView, width: CGFloat) -> CGFloat {
-        
-        view.frame = CGRect(x: 0, y: 0, width: width, height: view.frame.size.height)
-        view.setNeedsLayout()
-        view.layoutIfNeeded()
-        
-        return view.systemLayoutSizeFitting(UIView.layoutFittingCompressedSize).height
-    }
-}
+}
--- a/Demo/Classes/Presentation/Controllers/MainController.swift
+++ b/Demo/Classes/Presentation/Controllers/MainController.swift
@ -1,3 +1,11 @@
+//
+//  MainController.swift
+//  TabletDemo
+//
+//  Created by Max Sokolov on 16/04/16.
+//  Copyright © 2016 Tablet. All rights reserved.
+//
+
 import UIKit
 import TableKit

@ -15,9 +23,9 @@ class MainController: UIViewController {
        
        title = "TableKit"

-        let clickAction = TableRowAction<ConfigurableTableViewCell>(.click) { [weak self] (options) in
+        let clickAction = TableRowAction<String, ConfigurableTableViewCell>(.click) { [weak self] (data) in
            
-            switch options.indexPath.row {
+            switch (data.indexPath as NSIndexPath).row {
            case 0:
                self?.performSegue(withIdentifier: "autolayoutcells", sender: nil)
            case 1:
@ -26,16 +34,11 @@ class MainController: UIViewController {
                break
            }
        }
-        
-        let printClickAction = TableRowAction<ConfigurableTableViewCell>(.click) { (options) in
-            
-            print("click", options.indexPath)
-        }

        let rows = [

-            TableRow<ConfigurableTableViewCell>(item: "Autolayout cells", actions: [clickAction, printClickAction]),
-            TableRow<ConfigurableTableViewCell>(item: "Nib cells", actions: [clickAction, printClickAction])
+            TableRow<String, ConfigurableTableViewCell>(item: "Autolayout cells", actions: [clickAction]),
+            TableRow<String, ConfigurableTableViewCell>(item: "Nib cells", actions: [clickAction])
        ]

        // automatically creates a section, also could be used like tableDirector.append(rows: rows)
--- a/Demo/Classes/Presentation/Controllers/NibCellsController.swift
+++ b/Demo/Classes/Presentation/Controllers/NibCellsController.swift
@ -1,3 +1,11 @@
+//
+//  NibCellsController.swift
+//  TableKitDemo
+//
+//  Created by Max Sokolov on 18/06/16.
+//  Copyright © 2016 Tablet. All rights reserved.
+//
+
 import UIKit
 import TableKit

@ -13,13 +21,12 @@ class NibCellsController: UITableViewController {
        tableDirector = TableDirector(tableView: tableView)
        
        let numbers = [1000, 2000, 3000, 4000, 5000]
-
-        let rows = numbers.map {
-            TableRow<NibTableViewCell>(item: $0)
-                .on(.shouldHighlight) { (_) -> Bool in
-                    return false
-                }
+        
+        let shouldHighlightAction = TableRowAction<Int, NibTableViewCell>(.shouldHighlight) { (_) -> Bool in
+            return false
        }
+
+        let rows: [Row] = numbers.map { TableRow<Int, NibTableViewCell>(item: $0, actions: [shouldHighlightAction]) }
        
        tableDirector.append(rows: rows)
    }
--- a/Demo/Classes/Presentation/Views/AutolayoutSectionHeaderView.swift
+++ b/Demo/Classes/Presentation/Views/AutolayoutSectionHeaderView.swift
@ -1,24 +0,0 @@
-import UIKit
-
-final class AutolayoutSectionHeaderView: UIView {
-    
-    @IBOutlet weak var testLabel: UILabel!
-    
-    override func awakeFromNib() {
-        super.awakeFromNib()
-        
-        testLabel.text = "My super super super super super super super super super super super super super super super super super super super long text!"
-    }
-    
-    static func loadFromNib() -> AutolayoutSectionHeaderView {
-        
-        let view = Bundle(for: self)
-            .loadNibNamed(
-                String(describing: self),
-                owner: nil,
-                options: nil
-            )?.first
-        
-        return view as! AutolayoutSectionHeaderView
-    }
-}
--- a/Demo/Classes/Presentation/Views/AutolayoutSectionHeaderView.xib
+++ b/Demo/Classes/Presentation/Views/AutolayoutSectionHeaderView.xib
@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="rrg-Sy-26U" customClass="AutolayoutSectionHeaderView" customModule="TableKitDemo" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="267" height="68"/>
-            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-            <subviews>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7al-ia-5Ud">
-                    <rect key="frame" x="20" y="24" width="227" height="21"/>
-                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                    <nil key="textColor"/>
-                    <nil key="highlightedColor"/>
-                </label>
-            </subviews>
-            <color key="backgroundColor" red="1" green="0.67241452084558406" blue="0.62083349393841014" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-            <constraints>
-                <constraint firstAttribute="bottom" secondItem="7al-ia-5Ud" secondAttribute="bottom" constant="23" id="0Wx-eb-Gf8"/>
-                <constraint firstAttribute="trailing" secondItem="7al-ia-5Ud" secondAttribute="trailing" constant="20" id="5lG-XV-dd4"/>
-                <constraint firstItem="7al-ia-5Ud" firstAttribute="top" secondItem="rrg-Sy-26U" secondAttribute="top" constant="24" id="VBP-29-bA8"/>
-                <constraint firstItem="7al-ia-5Ud" firstAttribute="leading" secondItem="rrg-Sy-26U" secondAttribute="leading" constant="20" id="cAb-gb-fpr"/>
-            </constraints>
-            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <connections>
-                <outlet property="testLabel" destination="7al-ia-5Ud" id="sd9-v6-m3z"/>
-            </connections>
-            <point key="canvasLocation" x="-188.5" y="-277"/>
-        </view>
-    </objects>
-</document>
--- a/Demo/Classes/Presentation/Views/AutolayoutTableViewCell.swift
+++ b/Demo/Classes/Presentation/Views/AutolayoutTableViewCell.swift
@ -1,23 +1,32 @@
+//
+//  AutolayoutTableViewCell.swift
+//  TabletDemo
+//
+//  Created by Max Sokolov on 24/05/16.
+//  Copyright © 2016 Tablet. All rights reserved.
+//
+
 import UIKit
 import TableKit

 private let LoremIpsumTitle = "Lorem ipsum dolor sit amet, consectetur adipisicing elit"
+private let LoremIpsumBody = "Lorem ipsum dolor sit amet, consectetur adipisicing elit. Eius adipisci, sed libero. Iste asperiores suscipit, consequatur debitis animi impedit numquam facilis iusto porro labore dolorem, maxime magni incidunt. Delectus, est! Totam at eius excepturi deleniti sed, error repellat itaque omnis maiores tempora ratione dolor velit minus porro aspernatur repudiandae labore quas adipisci esse, nulla tempore voluptatibus cupiditate. Ab provident, atque. Possimus deserunt nisi perferendis, consequuntur odio et aperiam, est, dicta dolor itaque sunt laborum, magni qui optio illum dolore laudantium similique harum. Eveniet quis, libero eligendi delectus repellendus repudiandae ipsum? Vel nam odio dolorem, voluptas sequi minus quo tempore, animi est quia earum maxime. Reiciendis quae repellat, modi non, veniam natus soluta at optio vitae in excepturi minima eveniet dolor."

 class AutolayoutTableViewCell: UITableViewCell, ConfigurableCell {
    
-    typealias T = String
+    typealias T = Void
    
    @IBOutlet var titleLabel: UILabel!
    @IBOutlet var subtitleLabel: UILabel!

    static var estimatedHeight: CGFloat? {
-        return 150
+        return 700
    }
-
+    
    func configure(with string: T) {
        
        titleLabel.text = LoremIpsumTitle
-        subtitleLabel.text = string
+        subtitleLabel.text = LoremIpsumBody
    }
    
    override func layoutSubviews() {
@ -28,4 +37,4 @@ class AutolayoutTableViewCell: UITableViewCell, ConfigurableCell {
        titleLabel.preferredMaxLayoutWidth = titleLabel.bounds.size.width
        subtitleLabel.preferredMaxLayoutWidth = subtitleLabel.bounds.size.width
    }
-}
+}
--- a/Demo/Classes/Presentation/Views/ConfigurableTableViewCell.swift
+++ b/Demo/Classes/Presentation/Views/ConfigurableTableViewCell.swift
@ -1,3 +1,11 @@
+//
+//  ConfigurableTableViewCell.swift
+//  TableKitDemo
+//
+//  Created by Max Sokolov on 18/06/16.
+//  Copyright © 2016 Tablet. All rights reserved.
+//
+
 import UIKit
 import TableKit

--- a/Demo/Classes/Presentation/Views/NibTableViewCell.swift
+++ b/Demo/Classes/Presentation/Views/NibTableViewCell.swift
@ -1,3 +1,11 @@
+//
+//  NibTableViewCell.swift
+//  TableKitDemo
+//
+//  Created by Max Sokolov on 18/06/16.
+//  Copyright © 2016 Tablet. All rights reserved.
+//
+
 import UIKit
 import TableKit

@ -12,4 +20,4 @@ class NibTableViewCell: UITableViewCell, ConfigurableCell {
    func configure(with number: Int) {
        titleLabel.text = "\(number)"
    }
-}
+}
--- a/Demo/TableKitDemo.xcodeproj/project.pbxproj
+++ b/Demo/TableKitDemo.xcodeproj/project.pbxproj
@ -7,8 +7,6 @@
 	objects = {

 /* Begin PBXBuildFile section */
-		5079ADE31FE1BF1B000CC345 /* AutolayoutSectionHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5079ADE21FE1BF1B000CC345 /* AutolayoutSectionHeaderView.swift */; };
-		5079ADE61FE1BF65000CC345 /* AutolayoutSectionHeaderView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5079ADE51FE1BF65000CC345 /* AutolayoutSectionHeaderView.xib */; };
 		DA08A0531CF4E9B500BBF1F8 /* AutolayoutTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA08A0521CF4E9B500BBF1F8 /* AutolayoutTableViewCell.swift */; };
 		DA55465D1D1569CC00AA83EE /* AutolayoutCellsController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA55465C1D1569CC00AA83EE /* AutolayoutCellsController.swift */; };
 		DA5546601D156A4F00AA83EE /* ConfigurableTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA55465F1D156A4F00AA83EE /* ConfigurableTableViewCell.swift */; };
@ -63,8 +61,6 @@
 /* End PBXCopyFilesBuildPhase section */

 /* Begin PBXFileReference section */
-		5079ADE21FE1BF1B000CC345 /* AutolayoutSectionHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutolayoutSectionHeaderView.swift; sourceTree = "<group>"; };
-		5079ADE51FE1BF65000CC345 /* AutolayoutSectionHeaderView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AutolayoutSectionHeaderView.xib; sourceTree = "<group>"; };
 		DA08A0521CF4E9B500BBF1F8 /* AutolayoutTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AutolayoutTableViewCell.swift; sourceTree = "<group>"; };
 		DA55465C1D1569CC00AA83EE /* AutolayoutCellsController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AutolayoutCellsController.swift; sourceTree = "<group>"; };
 		DA55465F1D156A4F00AA83EE /* ConfigurableTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConfigurableTableViewCell.swift; sourceTree = "<group>"; };
@ -198,8 +194,6 @@
 				DA08A0521CF4E9B500BBF1F8 /* AutolayoutTableViewCell.swift */,
 				DA5546631D15762000AA83EE /* NibTableViewCell.swift */,
 				DA5546651D15765900AA83EE /* NibTableViewCell.xib */,
-				5079ADE21FE1BF1B000CC345 /* AutolayoutSectionHeaderView.swift */,
-				5079ADE51FE1BF65000CC345 /* AutolayoutSectionHeaderView.xib */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@ -233,13 +227,13 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0720;
-				LastUpgradeCheck = 1000;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = Tablet;
 				TargetAttributes = {
 					DAB7EB261BEF787300D2AD5E = {
 						CreatedOnToolsVersion = 7.0.1;
 						DevelopmentTeam = Z48R734SJX;
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 0800;
 					};
 				};
 			};
@ -248,7 +242,6 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
-				English,
 				en,
 				Base,
 			);
@ -291,7 +284,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				DAC2D5CF1C9D30A7009E9C19 /* Main.storyboard in Resources */,
-				5079ADE61FE1BF65000CC345 /* AutolayoutSectionHeaderView.xib in Resources */,
 				DA5546661D15765900AA83EE /* NibTableViewCell.xib in Resources */,
 				DAC2D5D01C9D30A7009E9C19 /* LaunchScreen.storyboard in Resources */,
 				DAC2D69C1C9E75E3009E9C19 /* Assets.xcassets in Resources */,
@ -309,7 +301,6 @@
 				DA55465D1D1569CC00AA83EE /* AutolayoutCellsController.swift in Sources */,
 				DA5546681D15771D00AA83EE /* NibCellsController.swift in Sources */,
 				DAC2D5CA1C9D303E009E9C19 /* AppDelegate.swift in Sources */,
-				5079ADE31FE1BF1B000CC345 /* AutolayoutSectionHeaderView.swift in Sources */,
 				DA5546641D15762000AA83EE /* NibTableViewCell.swift in Sources */,
 				DA5546601D156A4F00AA83EE /* ConfigurableTableViewCell.swift in Sources */,
 				DA08A0531CF4E9B500BBF1F8 /* AutolayoutTableViewCell.swift in Sources */,
@ -335,22 +326,14 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@ -378,7 +361,6 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@ -390,22 +372,14 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@ -426,7 +400,6 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 5.0;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@ -444,7 +417,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.tablekit.demo;
 				PRODUCT_NAME = TableKitDemo;
 				PROVISIONING_PROFILE = "";
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@ -461,7 +434,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.tablekit.demo;
 				PRODUCT_NAME = TableKitDemo;
 				PROVISIONING_PROFILE = "";
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
--- a/Demo/TableKitDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+++ b/Demo/TableKitDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>
--- a/Package.swift
+++ b/Package.swift
@ -1,19 +1,5 @@
-// swift-tools-version:5.7
-
 import PackageDescription

 let package = Package(
-    name: "TableKit",
-
-    products: [
-        .library(
-            name: "TableKit",
-            targets: ["TableKit"]),
-    ],
-
-    targets: [
-        .target(
-            name: "TableKit",
-            path: "Sources")
-    ]
-)
+    name: "TableKit"
+)
--- a/README.md
+++ b/README.md
@ -1,10 +1,10 @@
-# TableKit
+#TableKit

 <p align="left">
 	<a href="https://travis-ci.org/maxsokolov/TableKit"><img src="https://api.travis-ci.org/maxsokolov/TableKit.svg" alt="Build Status" /></a>
-	<a href="https://developer.apple.com/swift"><img src="https://img.shields.io/badge/Swift_5.1-compatible-4BC51D.svg?style=flat" alt="Swift 5.1 compatible" /></a>
+	<a href="https://developer.apple.com/swift"><img src="https://img.shields.io/badge/Swift_3.0-compatible-4BC51D.svg?style=flat" alt="Swift 3.0 compatible" /></a>
 	<a href="https://github.com/Carthage/Carthage"><img src="https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat" alt="Carthage compatible" /></a>
-	<a href="https://cocoapods.org/pods/tablekit"><img src="https://img.shields.io/badge/pod-2.11.0-blue.svg" alt="CocoaPods compatible" /></a>
+	<a href="https://cocoapods.org/pods/tablekit"><img src="https://img.shields.io/badge/pod-1.3.1-blue.svg" alt="CocoaPods compatible" /></a>
 	<img src="https://img.shields.io/badge/platform-iOS-blue.svg?style=flat" alt="Platform iOS" />
 	<a href="https://raw.githubusercontent.com/maxsokolov/tablekit/master/LICENSE"><img src="http://img.shields.io/badge/license-MIT-blue.svg?style=flat" alt="License: MIT" /></a>
 </p>
@ -36,9 +36,9 @@ Create your rows:
 ```swift
 import TableKit

-let row1 = TableRow<StringTableViewCell>(item: "1")
-let row2 = TableRow<IntTableViewCell>(item: 2)
-let row3 = TableRow<UserTableViewCell>(item: User(name: "John Doe", rating: 5))
+let row1 = TableRow<String, StringTableViewCell>(item: "1")
+let row2 = TableRow<Int, IntTableViewCell>(item: 2)
+let row3 = TableRow<User, UserTableViewCell>(item: User(name: "John Doe", rating: 5))
 ```
 Put rows into section:
 ```swift
@ -53,29 +53,29 @@ Done. Your table is ready. Your cells have to conform to `ConfigurableCell` prot
 ```swift
 class StringTableViewCell: UITableViewCell, ConfigurableCell {

-    func configure(with string: String) {
+	func configure(with string: String) {
 		
-        textLabel?.text = string
-    }
+		textLabel?.text = string
+	}
 }

 class UserTableViewCell: UITableViewCell, ConfigurableCell {

-    static var estimatedHeight: CGFloat? {
-        return 100
+	static var estimatedHeight: CGFloat? {
+		return 100
+	}
+
+	// is not required to be implemented
+	// by default reuse id is equal to cell's class name
+	static var reuseIdentifier: String {
+		return "my id"
    }

-    // is not required to be implemented
-    // by default reuse id is equal to cell's class name
-    static var reuseIdentifier: String {
-        return "my id"
-    }
-
-    func configure(with user: User) {
+	func configure(with user: User) {
 		
-        textLabel?.text = user.name
-        detailTextLabel?.text = "Rating: \(user.rating)"
-    }
+		textLabel?.text = user.name
+		detailTextLabel?.text = "Rating: \(user.rating)"
+	}
 }
 ```
 You could have as many rows and sections as you need.
@ -84,27 +84,26 @@ You could have as many rows and sections as you need.

 It nice to have some actions that related to your cells:
 ```swift
-let action = TableRowAction<StringTableViewCell>(.click) { (options) in
+let action = TableRowAction<String, StringTableViewCell>(.click) { (data) in

-    // you could access any useful information that relates to the action
+	// you could access any useful information that relates to the action

-    // options.cell - StringTableViewCell?
-    // options.item - String
-    // options.indexPath - IndexPath
-    // options.userInfo - [AnyHashable: Any]?
+	// data.cell - StringTableViewCell?
+	// data.item - String
+	// data.indexPath - NSIndexPath
 }

-let row = TableRow<StringTableViewCell>(item: "some", actions: [action])
+let row = TableRow<String, StringTableViewCell>(item: "some", actions: [action])
 ```
 Or, using nice chaining approach:
 ```swift
-let row = TableRow<StringTableViewCell>(item: "some")
-    .on(.click) { (options) in
+let row = TableRow<String, StringTableViewCell>(item: "some")
+	.action(.click) { (data) in
 	
-    }
-    .on(.shouldHighlight) { (options) -> Bool in
-        return false
-    }
+	}
+	.action(.shouldHighlight) { (data) -> Bool in
+		return false
+	}
 ```
 You could find all available actions [here](Sources/TableRowAction.swift).

@ -119,37 +118,18 @@ struct MyActions {

 class MyTableViewCell: UITableViewCell, ConfigurableCell {

-    @IBAction func myButtonClicked(sender: UIButton) {
+	@IBAction func myButtonClicked(sender: UIButton) {
 	
-        TableCellAction(key: MyActions.ButtonClicked, sender: self).invoke()
-    }
+		TableCellAction(key: MyActions.ButtonClicked, sender: self).invoke()
+	}
 }
 ```
 And handle them accordingly:
 ```swift
-let myAction = TableRowAction<MyTableViewCell>(.custom(MyActions.ButtonClicked)) { (options) in
+let myAction = TableRowAction<Void, MyTableViewCell>(.custom(MyActions.ButtonClicked)) { (data) in

 }
 ```
-## Multiple actions with same type
-
-It's also possible to use multiple actions with same type:
-```swift
-let click1 = TableRowAction<StringTableViewCell>(.click) { (options) in }
-click1.id = "click1" // optional
-
-let click2 = TableRowAction<StringTableViewCell>(.click) { (options) in }
-click2.id = "click2" // optional
-
-let row = TableRow<StringTableViewCell>(item: "some", actions: [click1, click2])
-```
-Could be useful in case if you want to separate your logic somehow. Actions will be invoked in order which they were attached.
-> If you define multiple actions with same type which also return a value, only last return value will be used for table view.
-
-You could also remove any action by id:
-```swift
-row.removeAction(forActionId: "action_id")
-```

 # Advanced

@ -158,31 +138,31 @@ By default TableKit relies on <a href="https://developer.apple.com/library/ios/d
 ```swift
 class StringTableViewCell: UITableViewCell, ConfigurableCell {

-    // ...
+	// ...

-    static var estimatedHeight: CGFloat? {
+	static var estimatedHeight: CGFloat? {
        return 255
    }
 }
 ```
 It's enough for most cases. But you may be not happy with this. So you could use a prototype cell to calculate cells heights. To enable this feature simply use this property:
 ```swift
-let tableDirector = TableDirector(tableView: tableView, shouldUsePrototypeCellHeightCalculation: true)
+tableDirector.shouldUsePrototypeCellHeightCalculation = true
 ```
-It does all dirty work with prototypes for you [behind the scene](Sources/TablePrototypeCellHeightCalculator.swift), so you don't have to worry about anything except of your cell configuration:
+It does all dirty work with prototypes for you [behind the scene](Sources/HeightStrategy.swift), so you don't have to worry about anything except of your cell configuration:
 ```swift
 class ImageTableViewCell: UITableViewCell, ConfigurableCell {

-    func configure(with url: NSURL) {
+	func configure(with url: NSURL) {
 		
-        loadImageAsync(url: url, imageView: imageView)
-    }
+		loadImageAsync(url: url, imageView: imageView)
+	}

-    override func layoutSubviews() {
-        super.layoutSubviews()
+	override func layoutSubviews() {
+		super.layoutSubviews()
        
-        contentView.layoutIfNeeded()
-        multilineLabel.preferredMaxLayoutWidth = multilineLabel.bounds.size.width
+		contentView.layoutIfNeeded()
+		multilineLabel.preferredMaxLayoutWidth = multilineLabel.bounds.size.width
    }
 }
 ```
@ -193,18 +173,18 @@ It's never been so easy to deal with table views.
 ```swift
 let users = /* some users array */

-let click = TableRowAction<UserTableViewCell>(.click) {
+let click = TableRowAction<String, UserTableViewCell>(.click) {

 }

-let rows = users.filter({ $0.state == .active }).map({ TableRow<UserTableViewCell>(item: $0.name, actions: [click]) })
+let rows = users.filter({ $0.state == .active }).map({ TableRow<String, UserTableViewCell>(item: $0.name, actions: [click]) })

 tableDirector += rows
 ```
 Done, your table is ready.
 ## Automatic cell registration

-TableKit can register your cells in a table view automatically. In case if your reusable cell id matches cell's xib name:
+TableKit can register your cells in a table view automatically. In case if your reusable cell id mathces cell's xib name:

 ```ruby
 MyTableViewCell.swift
@ -233,12 +213,8 @@ Clone the repo and drag files from `Sources` folder into your Xcode project.
 # Requirements

 - iOS 8.0
- Xcode 9.0
-
-# Changelog
-
-Keep an eye on [changes](CHANGELOG.md).
+- Xcode 8.0

 # License

-TableKit is available under the MIT license. See LICENSE for details.
+TableKit is available under the MIT license. See LICENSE for details.
--- a/Sources/ConfigurableCell.swift
+++ b/Sources/ConfigurableCell.swift
@ -22,36 +22,34 @@ import UIKit

 public protocol ConfigurableCell {

-    associatedtype CellData
+    associatedtype T

    static var reuseIdentifier: String { get }
-
    static var estimatedHeight: CGFloat? { get }
-
    static var defaultHeight: CGFloat? { get }

-    static var layoutType: LayoutType { get }
-
-    func configure(with _: CellData)
-
+    func configure(with _: T)
 }

 public extension ConfigurableCell where Self: UITableViewCell {
    
    static var reuseIdentifier: String {
-        return String(describing: self)
+        get {
+            return String(describing: self)
+        }
+        
    }
    
    static var estimatedHeight: CGFloat? {
-        return nil
+        get {
+            return nil
+        }
+        
    }
    
    static var defaultHeight: CGFloat? {
-        return nil
+        get {
+            return nil
+        }
    }
-
-    static var layoutType: LayoutType {
-        return .auto
-    }
-    
 }
--- a/Sources/Expandable.swift
+++ b/Sources/Expandable.swift
@ -1,96 +0,0 @@
-import UIKit
-
-public extension TimeInterval {
-    
-    static let defaultExpandableAnimationDuration: TimeInterval = 0.3
-    
-}
-
-public protocol Expandable {
-    
-    associatedtype ViewModelType: ExpandableCellViewModel
-    
-    var viewModel: ViewModelType? { get }
-    
-    func configure(state: ExpandableState)
-    
-}
-
-extension Expandable where Self: UITableViewCell & ConfigurableCell {
-    
-    public func initState() {
-        guard let viewModel = viewModel else {
-            return
-        }
-        
-        changeState(expandableState: viewModel.expandableState)
-    }
-    
-    private func changeState(expandableState: ExpandableState) {
-        // layout to get right frames, frame of bottom subview can be used to get expanded height
-        setNeedsLayout()
-        layoutIfNeeded()
-        
-        // apply changes
-        configure(state: expandableState)
-        layoutIfNeeded()
-    }
-    
-    public func toggleState(animated: Bool = true,
-                            animationDuration: TimeInterval = .defaultExpandableAnimationDuration) {
-        
-        guard let viewModel = viewModel,
-              let stateIndex = viewModel.availableStates.firstIndex(where: { $0 == viewModel.expandableState }) else {
-            return
-        }
-        
-        let targetState = stateIndex == viewModel.availableStates.count - 1
-            ? viewModel.availableStates[0]
-            : viewModel.availableStates[stateIndex + 1]
-        
-        transition(to: targetState,
-                   animated: animated,
-                   animationDuration: animationDuration)
-    }
-    
-    public func transition(to state: ExpandableState,
-                           animated: Bool = true,
-                           animationDuration: TimeInterval = .defaultExpandableAnimationDuration) {
-        
-        guard let tableView = tableView,
-              let viewModel = viewModel,
-            viewModel.expandableState != state else {
-            return
-        }
-        
-        let contentOffset = tableView.contentOffset
-        
-        if animated {
-            UIView.animate(withDuration: animationDuration,
-                           animations: { [weak self] in
-                self?.applyChanges(expandableState: state)
-            }, completion: { _ in
-                viewModel.expandableState = state
-            })
-        } else {
-            applyChanges(expandableState: state)
-            viewModel.expandableState = state
-        }
-        
-        tableView.beginUpdates()
-        tableView.endUpdates()
-        
-        tableView.setContentOffset(contentOffset, animated: false)
-    }
-    
-    public func applyChanges(expandableState: ExpandableState) {
-        changeState(expandableState: expandableState)
-        
-        if let indexPath = indexPath,
-           let tableDirector = (tableView?.delegate as? TableDirector),
-           let cellHeightCalculator = tableDirector.rowHeightCalculator as? ExpandableCellHeightCalculator {
-            cellHeightCalculator.updateCached(height: expandableState.height ?? height(layoutType: Self.layoutType), for: indexPath)
-        }
-    }
-    
-}
--- a/Sources/ExpandableCellHeightCalculator.swift
+++ b/Sources/ExpandableCellHeightCalculator.swift
@ -1,55 +0,0 @@
-import UIKit
-
-public final class ExpandableCellHeightCalculator: RowHeightCalculator {
-
-    private weak var tableView: UITableView?
-
-    private var prototypes = [String: UITableViewCell]()
-
-    private var cachedHeights = [IndexPath: CGFloat]()
-
-    public init(tableView: UITableView?) {
-        self.tableView = tableView
-    }
-
-    public func updateCached(height: CGFloat, for indexPath: IndexPath) {
-        cachedHeights[indexPath] = height
-    }
-
-    public func height(forRow row: Row, at indexPath: IndexPath) -> CGFloat {
-
-        guard let tableView = tableView else {
-            return 0
-        }
-
-        if let height = cachedHeights[indexPath] {
-            return height
-        }
-
-        var prototypeCell = prototypes[row.reuseIdentifier]
-        if prototypeCell == nil {
-            prototypeCell = tableView.dequeueReusableCell(withIdentifier: row.reuseIdentifier)
-            prototypes[row.reuseIdentifier] = prototypeCell
-        }
-
-        guard let cell = prototypeCell else {
-            return 0
-        }
-
-        row.configure(cell)
-        cell.layoutIfNeeded()
-
-        let height = cell.height(layoutType: row.layoutType)
-        cachedHeights[indexPath] = height
-        return height
-    }
-
-    public func estimatedHeight(forRow row: Row, at indexPath: IndexPath) -> CGFloat {
-        return height(forRow: row, at: indexPath)
-    }
-
-    public func invalidate() {
-        cachedHeights.removeAll()
-    }
-
-}
--- a/Sources/ExpandableCellViewModel.swift
+++ b/Sources/ExpandableCellViewModel.swift
@ -1,15 +0,0 @@
-public protocol ExpandableCellViewModel: AnyObject {
-    
-    var expandableState: ExpandableState { get set }
-    
-    var availableStates: [ExpandableState] { get }
-    
-}
-
-public extension ExpandableCellViewModel {
-    
-    var availableStates: [ExpandableState] {
-        return [.collapsed, .expanded]
-    }
-    
-}
--- a/Sources/ExpandableState.swift
+++ b/Sources/ExpandableState.swift
@ -1,41 +0,0 @@
-import UIKit
-
-public enum ExpandableState {
-    
-    case collapsed
-    
-    case expanded
-    
-    case height(value: CGFloat)
-    
-}
-
-extension ExpandableState: Equatable { }
-
-extension ExpandableState {
-    
-    public var isCollapsed: Bool {
-        guard case .collapsed = self else {
-            return false
-        }
-        
-        return true
-    }
-    
-    public var isExpanded: Bool {
-        guard case .expanded = self else {
-            return false
-        }
-        
-        return true
-    }
-    
-    public var height: CGFloat? {
-        guard case let .height(value: height) = self else {
-            return nil
-        }
-        
-        return height
-    }
-    
-}
--- a/Sources/TablePrototypeCellHeightCalculator.swift
+++ b/Sources/TablePrototypeCellHeightCalculator.swift
@ -20,18 +20,26 @@

 import UIKit

-open class TablePrototypeCellHeightCalculator: RowHeightCalculator {
+public protocol CellHeightCalculatable {

-    private(set) weak var tableView: UITableView?
+    func height(_ row: Row, path: IndexPath) -> CGFloat
+    func estimatedHeight(_ row: Row, path: IndexPath) -> CGFloat
+    
+    func invalidate()
+}
+
+open class PrototypeHeightStrategy: CellHeightCalculatable {
+
+    private weak var tableView: UITableView?
    private var prototypes = [String: UITableViewCell]()
    private var cachedHeights = [Int: CGFloat]()
    private var separatorHeight = 1 / UIScreen.main.scale
    
-    public init(tableView: UITableView?) {
+    init(tableView: UITableView?) {
        self.tableView = tableView
    }
    
-    open func height(forRow row: Row, at indexPath: IndexPath) -> CGFloat {
+    open func height(_ row: Row, path: IndexPath) -> CGFloat {

        guard let tableView = tableView else { return 0 }

@ -50,21 +58,20 @@ open class TablePrototypeCellHeightCalculator: RowHeightCalculator {

        guard let cell = prototypeCell else { return 0 }
        
-        cell.prepareForReuse()
        row.configure(cell)
        
        cell.bounds = CGRect(x: 0, y: 0, width: tableView.bounds.size.width, height: cell.bounds.height)
        cell.setNeedsLayout()
        cell.layoutIfNeeded()

-        let height = cell.contentView.systemLayoutSizeFitting(UIView.layoutFittingCompressedSize).height + (tableView.separatorStyle != .none ? separatorHeight : 0)
+        let height = cell.contentView.systemLayoutSizeFitting(UILayoutFittingCompressedSize).height + (tableView.separatorStyle != .none ? separatorHeight : 0)

        cachedHeights[hash] = height

        return height
    }

-    open func estimatedHeight(forRow row: Row, at indexPath: IndexPath) -> CGFloat {
+    open func estimatedHeight(_ row: Row, path: IndexPath) -> CGFloat {

        guard let tableView = tableView else { return 0 }

@ -78,7 +85,7 @@ open class TablePrototypeCellHeightCalculator: RowHeightCalculator {
            return estimatedHeight
        }

-        return UITableView.automaticDimension
+        return UITableViewAutomaticDimension
    }

    open func invalidate() {
--- a/Sources/LayoutType.swift
+++ b/Sources/LayoutType.swift
@ -1,7 +0,0 @@
-public enum LayoutType {
-
-    case manual
-
-    case auto
-
-}
--- a/Sources/TableCellAction.swift
+++ b/Sources/TableCellAction.swift
@ -20,6 +20,10 @@

 import UIKit

+struct TableKitNotifications {
+    static let CellAction = "TableKitNotificationsCellAction"
+}
+
 /**
    A custom action that you can trigger from your cell.
    You can easily catch actions using a chaining manner with your row.
@ -27,13 +31,13 @@ import UIKit
 open class TableCellAction {

    /// The cell that triggers an action.
-    public let cell: UITableViewCell
+    open let cell: UITableViewCell

    /// The action unique key.
-    public let key: String
+    open let key: String

    /// The custom user info.
-    public let userInfo: [AnyHashable: Any]?
+    open let userInfo: [AnyHashable: Any]?

    public init(key: String, sender: UITableViewCell, userInfo: [AnyHashable: Any]? = nil) {

--- a/Sources/TableCellRegisterer.swift
+++ b/Sources/TableCellRegisterer.swift
@ -48,7 +48,7 @@ class TableCellRegisterer {
        // in that case we could register nib
        if let _ = bundle.path(forResource: reuseIdentifier, ofType: "nib") {
            tableView?.register(UINib(nibName: reuseIdentifier, bundle: bundle), forCellReuseIdentifier: reuseIdentifier)
-        // otherwise, register cell class
+            // otherwise, register cell class
        } else {
            tableView?.register(cellType, forCellReuseIdentifier: reuseIdentifier)
        }
--- a/Sources/TableDirector.swift
+++ b/Sources/TableDirector.swift
@ -26,20 +26,16 @@ import UIKit
 open class TableDirector: NSObject, UITableViewDataSource, UITableViewDelegate {
    
    open private(set) weak var tableView: UITableView?
-    open fileprivate(set) var sections = [TableSection]()
+    open private(set) var sections = [TableSection]()
    
    private weak var scrollDelegate: UIScrollViewDelegate?
+    private var heightStrategy: CellHeightCalculatable?
    private var cellRegisterer: TableCellRegisterer?
-    public private(set) var rowHeightCalculator: RowHeightCalculator?
-    private var sectionsIndexTitlesIndexes: [Int]?
    
-    @available(*, deprecated, message: "Produced incorrect behaviour")
    open var shouldUsePrototypeCellHeightCalculation: Bool = false {
        didSet {
            if shouldUsePrototypeCellHeightCalculation {
-                rowHeightCalculator = TablePrototypeCellHeightCalculator(tableView: tableView)
-            } else {
-                rowHeightCalculator = nil
+                heightStrategy = PrototypeHeightStrategy(tableView: tableView)
            }
        }
    }
@ -48,43 +44,19 @@ open class TableDirector: NSObject, UITableViewDataSource, UITableViewDelegate {
        return sections.isEmpty
    }
    
-    public init(
-        tableView: UITableView,
-        scrollDelegate: UIScrollViewDelegate? = nil,
-        shouldUseAutomaticCellRegistration: Bool = true,
-        cellHeightCalculator: RowHeightCalculator?)
-    {
+    public init(tableView: UITableView, scrollDelegate: UIScrollViewDelegate? = nil, shouldUseAutomaticCellRegistration: Bool = true) {
        super.init()
        
        if shouldUseAutomaticCellRegistration {
            self.cellRegisterer = TableCellRegisterer(tableView: tableView)
        }
        
-        self.rowHeightCalculator = cellHeightCalculator
        self.scrollDelegate = scrollDelegate
        self.tableView = tableView
        self.tableView?.delegate = self
        self.tableView?.dataSource = self
-
-        NotificationCenter.default.addObserver(self, selector: #selector(didReceiveAction), name: NSNotification.Name(rawValue: TableKitNotifications.CellAction), object: nil)
-    }
-    
-    public convenience init(
-        tableView: UITableView,
-        scrollDelegate: UIScrollViewDelegate? = nil,
-        shouldUseAutomaticCellRegistration: Bool = true,
-        shouldUsePrototypeCellHeightCalculation: Bool = false)
-    {
-        let heightCalculator: TablePrototypeCellHeightCalculator? = shouldUsePrototypeCellHeightCalculation
-            ? TablePrototypeCellHeightCalculator(tableView: tableView)
-            : nil
        
-        self.init(
-            tableView: tableView,
-            scrollDelegate: scrollDelegate,
-            shouldUseAutomaticCellRegistration: shouldUseAutomaticCellRegistration,
-            cellHeightCalculator: heightCalculator
-        )
+        NotificationCenter.default.addObserver(self, selector: #selector(didReceiveAction), name: NSNotification.Name(rawValue: TableKitNotifications.CellAction), object: nil)
    }
    
    deinit {
@ -95,28 +67,11 @@ open class TableDirector: NSObject, UITableViewDataSource, UITableViewDelegate {
        tableView?.reloadData()
    }
    
-    // MARK: - Private
-    private func row(at indexPath: IndexPath) -> Row? {
-        if indexPath.section < sections.count && indexPath.row < sections[indexPath.section].rows.count {
-            return sections[indexPath.section].rows[indexPath.row]
-        }
-        return nil
-    }
-    
    // MARK: Public
+    
    @discardableResult
-    open func invoke(
-        action: TableRowActionType,
-        cell: UITableViewCell?, indexPath: IndexPath,
-        userInfo: [AnyHashable: Any]? = nil) -> Any?
-    {
-        guard let row = row(at: indexPath) else { return nil }
-        return row.invoke(
-            action: action,
-            cell: cell,
-            path: indexPath,
-            userInfo: userInfo
-        )
+    open func invoke(action: TableRowActionType, cell: UITableViewCell?, indexPath: IndexPath) -> Any? {
+        return sections[(indexPath as NSIndexPath).section].rows[(indexPath as NSIndexPath).row].invoke(action, cell: cell, path: indexPath)
    }
    
    open override func responds(to selector: Selector) -> Bool {
@ -124,72 +79,54 @@ open class TableDirector: NSObject, UITableViewDataSource, UITableViewDelegate {
    }
    
    open override func forwardingTarget(for selector: Selector) -> Any? {
-        return scrollDelegate?.responds(to: selector) == true
-            ? scrollDelegate
-            : super.forwardingTarget(for: selector)
+        return scrollDelegate?.responds(to: selector) == true ? scrollDelegate : super.forwardingTarget(for: selector)
    }
    
-    // MARK: - Internal
+    // MARK: - Internal -
+    
    func hasAction(_ action: TableRowActionType, atIndexPath indexPath: IndexPath) -> Bool {
-        guard let row = row(at: indexPath) else { return false }
-        return row.has(action: action)
+        return sections[(indexPath as NSIndexPath).section].rows[(indexPath as NSIndexPath).row].hasAction(action)
    }
    
-    @objc
    func didReceiveAction(_ notification: Notification) {
        
        guard let action = notification.object as? TableCellAction, let indexPath = tableView?.indexPath(for: action.cell) else { return }
-        invoke(action: .custom(action.key), cell: action.cell, indexPath: indexPath, userInfo: notification.userInfo)
+        invoke(action: .custom(action.key), cell: action.cell, indexPath: indexPath)
    }
    
    // MARK: - Height
+    
    open func tableView(_ tableView: UITableView, estimatedHeightForRowAt indexPath: IndexPath) -> CGFloat {
+        
+        let row = sections[(indexPath as NSIndexPath).section].rows[(indexPath as NSIndexPath).row]

-        let row = sections[indexPath.section].rows[indexPath.row]
-        
-        if rowHeightCalculator != nil {
-            cellRegisterer?.register(cellType: row.cellType, forCellReuseIdentifier: row.reuseIdentifier)
-        }
-        
-        return row.defaultHeight
-            ?? row.estimatedHeight
-            ?? rowHeightCalculator?.estimatedHeight(forRow: row, at: indexPath)
-            ?? UITableView.automaticDimension
+        cellRegisterer?.register(cellType: row.cellType, forCellReuseIdentifier: row.reuseIdentifier)
+
+        return row.estimatedHeight ?? heightStrategy?.estimatedHeight(row, path: indexPath) ?? UITableViewAutomaticDimension
    }
    
    open func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
        
-        let row = sections[indexPath.section].rows[indexPath.row]
-        
-        if rowHeightCalculator != nil {
-            cellRegisterer?.register(cellType: row.cellType, forCellReuseIdentifier: row.reuseIdentifier)
-        }
+        let row = sections[(indexPath as NSIndexPath).section].rows[(indexPath as NSIndexPath).row]

        let rowHeight = invoke(action: .height, cell: nil, indexPath: indexPath) as? CGFloat

-        return rowHeight
-            ?? row.defaultHeight
-            ?? rowHeightCalculator?.height(forRow: row, at: indexPath)
-            ?? UITableView.automaticDimension
+        return rowHeight ?? row.defaultHeight ?? heightStrategy?.height(row, path: indexPath) ?? UITableViewAutomaticDimension
    }
    
    // MARK: UITableViewDataSource - configuration
+    
    open func numberOfSections(in tableView: UITableView) -> Int {
        return sections.count
    }
    
    open func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        guard section < sections.count else { return 0 }
-        
        return sections[section].numberOfRows
    }
    
    open func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
        
-        let row = sections[indexPath.section].rows[indexPath.row]
-        
-        cellRegisterer?.register(cellType: row.cellType, forCellReuseIdentifier: row.reuseIdentifier)
-        
+        let row = sections[(indexPath as NSIndexPath).section].rows[(indexPath as NSIndexPath).row]
        let cell = tableView.dequeueReusableCell(withIdentifier: row.reuseIdentifier, for: indexPath)
        
        if cell.frame.size.width != tableView.frame.size.width {
@ -204,78 +141,41 @@ open class TableDirector: NSObject, UITableViewDataSource, UITableViewDelegate {
    }
    
    // MARK: UITableViewDataSource - section setup
+    
    open func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
-        guard section < sections.count else { return nil }
-        
        return sections[section].headerTitle
    }
    
    open func tableView(_ tableView: UITableView, titleForFooterInSection section: Int) -> String? {
-        guard section < sections.count else { return nil }
-        
        return sections[section].footerTitle
    }
    
    // MARK: UITableViewDelegate - section setup
+    
    open func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
-        guard section < sections.count else { return nil }
-        
        return sections[section].headerView
    }
    
    open func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
-        guard section < sections.count else { return nil }
-        
        return sections[section].footerView
    }
    
    open func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
-        guard section < sections.count else { return 0 }
        
        let section = sections[section]
-        return section.headerHeight ?? section.headerView?.frame.size.height ?? UITableView.automaticDimension
+        return section.headerHeight ?? section.headerView?.frame.size.height ?? 0
    }
    
    open func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
-        guard section < sections.count else { return 0 }
        
        let section = sections[section]
-        return section.footerHeight
-            ?? section.footerView?.frame.size.height
-            ?? UITableView.automaticDimension
-    }
-    
-    // MARK: UITableViewDataSource - Index
-    public func sectionIndexTitles(for tableView: UITableView) -> [String]? {
-        
-        var indexTitles = [String]()
-        var indexTitlesIndexes = [Int]()
-        sections.enumerated().forEach { index, section in
-            
-            if let title = section.indexTitle {
-                indexTitles.append(title)
-                indexTitlesIndexes.append(index)
-            }
-        }
-        if !indexTitles.isEmpty {
-            
-            sectionsIndexTitlesIndexes = indexTitlesIndexes
-            return indexTitles
-        }
-        sectionsIndexTitlesIndexes = nil
-        return nil
-    }
-    
-    public func tableView(
-        _ tableView: UITableView,
-        sectionForSectionIndexTitle title: String,
-        at index: Int) -> Int
-    {
-        return sectionsIndexTitlesIndexes?[index] ?? 0
+        return section.footerHeight ?? section.footerView?.frame.size.height ?? 0
    }
    
    // MARK: UITableViewDelegate - actions
+    
    open func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        
        let cell = tableView.cellForRow(at: indexPath)
        
        if invoke(action: .click, cell: cell, indexPath: indexPath) != nil {
@ -292,184 +192,77 @@ open class TableDirector: NSObject, UITableViewDataSource, UITableViewDelegate {
    open func tableView(_ tableView: UITableView, willDisplay cell: UITableViewCell, forRowAt indexPath: IndexPath) {
        invoke(action: .willDisplay, cell: cell, indexPath: indexPath)
    }
-
-    public func tableView(_ tableView: UITableView, didEndDisplaying cell: UITableViewCell, forRowAt indexPath: IndexPath) {
-        invoke(action: .didEndDisplaying, cell: cell, indexPath: indexPath)
-    }
    
    open func tableView(_ tableView: UITableView, shouldHighlightRowAt indexPath: IndexPath) -> Bool {
        return invoke(action: .shouldHighlight, cell: tableView.cellForRow(at: indexPath), indexPath: indexPath) as? Bool ?? true
    }
    
    open func tableView(_ tableView: UITableView, willSelectRowAt indexPath: IndexPath) -> IndexPath? {
+        
        if hasAction(.willSelect, atIndexPath: indexPath) {
            return invoke(action: .willSelect, cell: tableView.cellForRow(at: indexPath), indexPath: indexPath) as? IndexPath
        }
-        
        return indexPath
    }
-
-    open func tableView(_ tableView: UITableView, willDeselectRowAt indexPath: IndexPath) -> IndexPath? {
-        if hasAction(.willDeselect, atIndexPath: indexPath) {
-            return invoke(action: .willDeselect, cell: tableView.cellForRow(at: indexPath), indexPath: indexPath) as? IndexPath
-        }
-
-        return indexPath
-    }
-
-    @available(iOS 13.0, *)
-    open func tableView(
-        _ tableView: UITableView,
-        shouldBeginMultipleSelectionInteractionAt indexPath: IndexPath) -> Bool
-    {
-        invoke(action: .shouldBeginMultipleSelection, cell: tableView.cellForRow(at: indexPath), indexPath: indexPath) as? Bool ?? false
-    }
-
-    @available(iOS 13.0, *)
-    open func tableView(
-        _ tableView: UITableView,
-        didBeginMultipleSelectionInteractionAt indexPath: IndexPath)
-    {
-        invoke(action: .didBeginMultipleSelection, cell: tableView.cellForRow(at: indexPath), indexPath: indexPath)
-    }
    
-    @available(iOS 13.0, *)
-    open func tableView(
-        _ tableView: UITableView,
-        contextMenuConfigurationForRowAt indexPath: IndexPath,
-        point: CGPoint) -> UIContextMenuConfiguration?
-    {
-        invoke(action: .showContextMenu, cell: tableView.cellForRow(at: indexPath), indexPath: indexPath, userInfo: [TableKitUserInfoKeys.ContextMenuInvokePoint: point]) as? UIContextMenuConfiguration
-    }
-
-    // MARK: - Row editing
+    // MARK: - Row editing -
+    
    open func tableView(_ tableView: UITableView, canEditRowAt indexPath: IndexPath) -> Bool {
-        return sections[indexPath.section].rows[indexPath.row].isEditingAllowed(forIndexPath: indexPath)
-    }
-
-    open func tableView(_ tableView: UITableView,
-                        leadingSwipeActionsConfigurationForRowAt indexPath: IndexPath) -> UISwipeActionsConfiguration? {
-        let currentRow = sections[indexPath.section].rows[indexPath.row]
-        let configuration = UISwipeActionsConfiguration(actions: currentRow.leadingContextualActions)
-        
-        configuration.performsFirstActionWithFullSwipe = currentRow.performsFirstActionWithFullSwipe
-        
-        return configuration
-    }
-
-    open func tableView(_ tableView: UITableView,
-                        trailingSwipeActionsConfigurationForRowAt indexPath: IndexPath) -> UISwipeActionsConfiguration? {
-        let currentRow = sections[indexPath.section].rows[indexPath.row]
-        let configuration = UISwipeActionsConfiguration(actions: currentRow.trailingContextualActions)
-        
-        configuration.performsFirstActionWithFullSwipe = currentRow.performsFirstActionWithFullSwipe
-        
-        return configuration
+        return sections[(indexPath as NSIndexPath).section].rows[(indexPath as NSIndexPath).row].isEditingAllowed(forIndexPath: indexPath)
    }
    
-    open func tableView(_ tableView: UITableView, editingStyleForRowAt indexPath: IndexPath) -> UITableViewCell.EditingStyle {
-        if invoke(action: .canDelete, cell: tableView.cellForRow(at: indexPath), indexPath: indexPath) as? Bool ?? false {
-            return UITableViewCell.EditingStyle.delete
-        }
+    open func tableView(_ tableView: UITableView, editActionsForRowAt indexPath: IndexPath) -> [UITableViewRowAction]? {
+        return sections[(indexPath as NSIndexPath).section].rows[(indexPath as NSIndexPath).row].editingActions
+    }
+    
+    open func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCellEditingStyle, forRowAt indexPath: IndexPath) {
        
-        return UITableViewCell.EditingStyle.none
-    }
-    
-    public func tableView(_ tableView: UITableView, shouldIndentWhileEditingRowAt indexPath: IndexPath) -> Bool {
-        return false
-    }
-    
-    public func tableView(_ tableView: UITableView, targetIndexPathForMoveFromRowAt sourceIndexPath: IndexPath, toProposedIndexPath proposedDestinationIndexPath: IndexPath) -> IndexPath {
-        return invoke(action: .canMoveTo, cell: tableView.cellForRow(at: sourceIndexPath), indexPath: sourceIndexPath, userInfo: [TableKitUserInfoKeys.CellCanMoveProposedIndexPath: proposedDestinationIndexPath]) as? IndexPath ?? proposedDestinationIndexPath
-    }
-    
-    open func tableView(_ tableView: UITableView, commit editingStyle: UITableViewCell.EditingStyle, forRowAt indexPath: IndexPath) {
        if editingStyle == .delete {
            invoke(action: .clickDelete, cell: tableView.cellForRow(at: indexPath), indexPath: indexPath)
        }
    }
    
-    open func tableView(_ tableView: UITableView, canMoveRowAt indexPath: IndexPath) -> Bool {
-        return invoke(action: .canMove, cell: tableView.cellForRow(at: indexPath), indexPath: indexPath) as? Bool ?? false
-    }
-    
-    open func tableView(_ tableView: UITableView, moveRowAt sourceIndexPath: IndexPath, to destinationIndexPath: IndexPath) {
-        invoke(action: .move, cell: tableView.cellForRow(at: sourceIndexPath), indexPath: sourceIndexPath, userInfo: [TableKitUserInfoKeys.CellMoveDestinationIndexPath: destinationIndexPath])
-    }
-  
-    open func tableView(_ tableView: UITableView, accessoryButtonTappedForRowWith indexPath: IndexPath) {
-      let cell = tableView.cellForRow(at: indexPath)
-      invoke(action: .accessoryButtonTap, cell: cell, indexPath: indexPath)
-    }
-}
-
-// MARK: - Sections manipulation
-extension TableDirector {
+    // MARK: - Sections manipulation -
    
    @discardableResult
-    public func append(section: TableSection) -> Self {
+    open func append(section: TableSection) -> Self {
        
        append(sections: [section])
        return self
    }
    
    @discardableResult
-    public func append(sections: [TableSection]) -> Self {
-
+    open func append(sections: [TableSection]) -> Self {
+        
        self.sections.append(contentsOf: sections)
        return self
    }
    
    @discardableResult
-    public func append(rows: [Row]) -> Self {
-
+    open func append(rows: [Row]) -> Self {
+        
        append(section: TableSection(rows: rows))
        return self
    }
    
    @discardableResult
-    public func insert(section: TableSection, atIndex index: Int) -> Self {
-
+    open func insert(section: TableSection, atIndex index: Int) -> Self {
+        
        sections.insert(section, at: index)
        return self
    }
    
    @discardableResult
-    public func replaceSection(at index: Int, with section: TableSection) -> Self {
-
-        if index < sections.count {
-            sections[index] = section
-        }
-        return self
-    }
-    
-    @discardableResult
-    public func delete(sectionAt index: Int) -> Self {
-
+    open func delete(index: Int) -> Self {
+        
        sections.remove(at: index)
        return self
    }
-
-    @discardableResult
-    public func remove(sectionAt index: Int) -> Self {
-        return delete(sectionAt: index)
-    }
    
    @discardableResult
-    public func clear() -> Self {
-
-        rowHeightCalculator?.invalidate()
+    open func clear() -> Self {
+        
        sections.removeAll()
-        
-        return self
-    }
-    
-    // MARK: - deprecated methods
-    @available(*, deprecated, message: "Use 'delete(sectionAt:)' method instead")
-    @discardableResult
-    public func delete(index: Int) -> Self {
-        
-        sections.remove(at: index)
        return self
    }
 }
--- a/Sources/TableKit.swift
+++ b/Sources/TableKit.swift
@ -1,111 +0,0 @@
-//
-//    Copyright (c) 2015 Max Sokolov https://twitter.com/max_sokolov
-//
-//    Permission is hereby granted, free of charge, to any person obtaining a copy of
-//    this software and associated documentation files (the "Software"), to deal in
-//    the Software without restriction, including without limitation the rights to
-//    use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-//    the Software, and to permit persons to whom the Software is furnished to do so,
-//    subject to the following conditions:
-//
-//    The above copyright notice and this permission notice shall be included in all
-//    copies or substantial portions of the Software.
-//
-//    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-//    FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-//    COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-//    IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-//    CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-import UIKit
-
-struct TableKitNotifications {
-    static let CellAction = "TableKitNotificationsCellAction"
-}
-
-public struct TableKitUserInfoKeys {
-    public static let CellMoveDestinationIndexPath = "TableKitCellMoveDestinationIndexPath"
-    public static let CellCanMoveProposedIndexPath = "CellCanMoveProposedIndexPath"
-    public static let ContextMenuInvokePoint = "ContextMenuInvokePoint"
-}
-
-public protocol RowConfigurable {
-    
-    func configure(_ cell: UITableViewCell)
-
-}
-
-public protocol RowActionable {
-    var leadingContextualActions: [UIContextualAction] { get }
-    var trailingContextualActions: [UIContextualAction] { get }
-    var performsFirstActionWithFullSwipe: Bool { get }
-
-    func isEditingAllowed(forIndexPath indexPath: IndexPath) -> Bool
-
-    func invoke(
-        action: TableRowActionType,
-        cell: UITableViewCell?,
-        path: IndexPath,
-        userInfo: [AnyHashable: Any]?) -> Any?
-    
-    func has(action: TableRowActionType) -> Bool
-}
-
-public protocol RowHashable {
-    
-    var hashValue: Int { get }
-}
-
-public protocol Row: RowConfigurable, RowActionable, RowHashable {
-    
-    var reuseIdentifier: String { get }
-    var cellType: AnyClass { get }
-
-    var layoutType: LayoutType { get }
-    var estimatedHeight: CGFloat? { get }
-    var defaultHeight: CGFloat? { get }
-}
-
-public enum TableRowActionType {
-    
-    case click
-    case clickDelete
-    case select
-    case deselect
-    case willSelect
-    case willDeselect
-    case willDisplay
-    case didEndDisplaying
-    case shouldHighlight
-    case shouldBeginMultipleSelection
-    case didBeginMultipleSelection
-    case height
-    case canEdit
-    case configure
-    case canDelete
-    case canMove
-    case canMoveTo
-    case move
-    case showContextMenu
-    case accessoryButtonTap
-    case custom(String)
-    
-    var key: String {
-        
-        switch (self) {
-        case .custom(let key):
-            return key
-        default:
-            return "_\(self)"
-        }
-    }
-}
-
-public protocol RowHeightCalculator {
-    
-    func height(forRow row: Row, at indexPath: IndexPath) -> CGFloat
-    func estimatedHeight(forRow row: Row, at indexPath: IndexPath) -> CGFloat
-    
-    func invalidate()
-}
--- a/Sources/TableRow.swift
+++ b/Sources/TableRow.swift
@ -20,22 +20,39 @@

 import UIKit

-open class TableRow<CellType: ConfigurableCell>: Row where CellType: UITableViewCell {
+public protocol RowConfigurable {
+    
+    func configure(_ cell: UITableViewCell)
+}

-    public let item: CellType.CellData
-    private lazy var actions = [String: [TableRowAction<CellType>]]()
+public protocol RowActionable {
+    
+    var editingActions: [UITableViewRowAction]? { get }
+    func isEditingAllowed(forIndexPath indexPath: IndexPath) -> Bool
+    
+    func invoke(_ action: TableRowActionType, cell: UITableViewCell?, path: IndexPath) -> Any?
+    func hasAction(_ action: TableRowActionType) -> Bool
+}

-    open var leadingContextualActions: [UIContextualAction] {
-        []
-    }
+public protocol RowHashable {
+    
+    var hashValue: Int { get }
+}

-    open var trailingContextualActions: [UIContextualAction] {
-        []
-    }
+public protocol Row: RowConfigurable, RowActionable, RowHashable {
+    
+    var reuseIdentifier: String { get }
+    var cellType: AnyClass { get }
+    
+    var estimatedHeight: CGFloat? { get }
+    var defaultHeight: CGFloat? { get }
+}

-    open var performsFirstActionWithFullSwipe: Bool {
-        false
-    }
+open class TableRow<ItemType, CellType: ConfigurableCell>: Row where CellType.T == ItemType, CellType: UITableViewCell {
+    
+    open let item: ItemType
+    private lazy var actions = [String: TableRowAction<ItemType, CellType>]()
+    private(set) open var editingActions: [UITableViewRowAction]?
    
    open var hashValue: Int {
        return ObjectIdentifier(self).hashValue
@ -52,105 +69,55 @@ open class TableRow<CellType: ConfigurableCell>: Row where CellType: UITableView
    open var defaultHeight: CGFloat? {
        return CellType.defaultHeight
    }
-
-    open var layoutType: LayoutType {
-        return CellType.layoutType
-    }
    
    open var cellType: AnyClass {
        return CellType.self
    }
    
-    public init(item: CellType.CellData,
-                actions: [TableRowAction<CellType>]? = nil) {
+    public init(item: ItemType, actions: [TableRowAction<ItemType, CellType>]? = nil, editingActions: [UITableViewRowAction]? = nil) {
        
        self.item = item
-        
-        actions?.forEach { on($0) }
+        self.editingActions = editingActions
+        actions?.forEach { self.actions[$0.type.key] = $0 }
    }
    
    // MARK: - RowConfigurable -
    
    open func configure(_ cell: UITableViewCell) {
-        
        (cell as? CellType)?.configure(with: item)
    }
-   
+    
    // MARK: - RowActionable -
    
-    open func invoke(action: TableRowActionType, cell: UITableViewCell?, path: IndexPath, userInfo: [AnyHashable: Any]? = nil) -> Any? {
-
-        return actions[action.key]?.compactMap({ $0.invokeActionOn(cell: cell, item: item, path: path, userInfo: userInfo) }).last
+    open func invoke(_ action: TableRowActionType, cell: UITableViewCell?, path: IndexPath) -> Any? {
+        return actions[action.key]?.invoke(item: item, cell: cell, path: path)
    }
    
-    open func has(action: TableRowActionType) -> Bool {
-        
+    open func hasAction(_ action: TableRowActionType) -> Bool {
        return actions[action.key] != nil
    }
    
    open func isEditingAllowed(forIndexPath indexPath: IndexPath) -> Bool {
        
        if actions[TableRowActionType.canEdit.key] != nil {
-            return invoke(action: .canEdit, cell: nil, path: indexPath) as? Bool ?? false
+            return invoke(.canEdit, cell: nil, path: indexPath) as? Bool ?? false
        }
-        
-        return !leadingContextualActions.isEmpty
-            || !trailingContextualActions.isEmpty
-            || actions[TableRowActionType.clickDelete.key] != nil
+        return editingActions?.isEmpty == false || actions[TableRowActionType.clickDelete.key] != nil
    }
    
    // MARK: - actions -
    
    @discardableResult
-    open func on(_ action: TableRowAction<CellType>) -> Self {
-
-        if actions[action.type.key] == nil {
-            actions[action.type.key] = [TableRowAction<CellType>]()
-        }
-        actions[action.type.key]?.append(action)
+    open func action(_ action: TableRowAction<ItemType, CellType>) -> Self {
        
+        actions[action.type.key] = action
        return self
    }
-
-    @discardableResult
-    open func on<T>(_ type: TableRowActionType, handler: @escaping (_ options: TableRowActionOptions<CellType>) -> T) -> Self {
-        
-        return on(TableRowAction<CellType>(type, handler: handler))
-    }
    
    @discardableResult
-    open func on(_ key: String, handler: @escaping (_ options: TableRowActionOptions<CellType>) -> ()) -> Self {
+    open func action<T>(_ type: TableRowActionType, handler: @escaping (_ data: TableRowActionData<ItemType, CellType>) -> T) -> Self {
        
-        return on(TableRowAction<CellType>(.custom(key), handler: handler))
-    }
-
-    open func removeAllActions() {
-        
-        actions.removeAll()
-    }
-    
-    open func removeAction(forActionId actionId: String) {
-
-        for (key, value) in actions {
-            if let actionIndex = value.firstIndex(where: { $0.id == actionId }) {
-                actions[key]?.remove(at: actionIndex)
-            }
-        }
-    }
-    
-    // MARK: - deprecated actions -
-    
-    @available(*, deprecated, message: "Use 'on' method instead")
-    @discardableResult
-    open func action(_ action: TableRowAction<CellType>) -> Self {
-
-        return on(action)
-    }
-    
-    @available(*, deprecated, message: "Use 'on' method instead")
-    @discardableResult
-    open func action<T>(_ type: TableRowActionType, handler: @escaping (_ options: TableRowActionOptions<CellType>) -> T) -> Self {
-        
-        return on(TableRowAction<CellType>(type, handler: handler))
+        actions[type.key] = TableRowAction<ItemType, CellType>(type, handler: handler)
+        return self
    }
 }
--- a/Sources/TableRowAction.swift
+++ b/Sources/TableRowAction.swift
@ -20,14 +20,39 @@

 import UIKit

-open class TableRowActionOptions<CellType: ConfigurableCell> where CellType: UITableViewCell {
+public enum TableRowActionType {
+    
+    case click
+    case clickDelete
+    case select
+    case deselect
+    case willSelect
+    case willDisplay
+    case shouldHighlight
+    case height
+    case canEdit
+    case configure
+    case custom(String)
+    
+    var key: String {
+        
+        switch (self) {
+        case .custom(let key):
+            return key
+        default:
+            return "_\(self)"
+        }
+    }
+}

-    public let item: CellType.CellData
-    public let cell: CellType?
-    public let indexPath: IndexPath
-    public let userInfo: [AnyHashable: Any]?
+open class TableRowActionData<ItemType, CellType: ConfigurableCell> where CellType.T == ItemType, CellType: UITableViewCell {

-    init(item: CellType.CellData, cell: CellType?, path: IndexPath, userInfo: [AnyHashable: Any]?) {
+    open let item: ItemType
+    open let cell: CellType?
+    open let indexPath: IndexPath
+    open let userInfo: [AnyHashable: Any]?
+
+    init(item: ItemType, cell: CellType?, path: IndexPath, userInfo: [AnyHashable: Any]?) {

        self.item = item
        self.cell = cell
@ -36,48 +61,40 @@ open class TableRowActionOptions<CellType: ConfigurableCell> where CellType: UIT
    }
 }

-private enum TableRowActionHandler<CellType: ConfigurableCell> where CellType: UITableViewCell {
+private enum TableRowActionHandler<ItemType, CellType: ConfigurableCell> where CellType.T == ItemType, CellType: UITableViewCell {

-    case voidAction((TableRowActionOptions<CellType>) -> Void)
-    case action((TableRowActionOptions<CellType>) -> Any?)
+    case voidAction((TableRowActionData<ItemType, CellType>) -> Void)
+    case action((TableRowActionData<ItemType, CellType>) -> Any?)

-    func invoke(withOptions options: TableRowActionOptions<CellType>) -> Any? {
+    func invoke(item: ItemType, cell: UITableViewCell?, path: IndexPath) -> Any? {
        
        switch self {
        case .voidAction(let handler):
-            return handler(options)
+            return handler(TableRowActionData(item: item, cell: cell as? CellType, path: path, userInfo: nil))
        case .action(let handler):
-            return handler(options)
+            return handler(TableRowActionData(item: item, cell: cell as? CellType, path: path, userInfo: nil))
        }
    }
 }

-open class TableRowAction<CellType: ConfigurableCell> where CellType: UITableViewCell {
+open class TableRowAction<ItemType, CellType: ConfigurableCell> where CellType.T == ItemType, CellType: UITableViewCell {

-    open var id: String?
-    public let type: TableRowActionType
-    private let handler: TableRowActionHandler<CellType>
+    open let type: TableRowActionType
+    private let handler: TableRowActionHandler<ItemType, CellType>
    
-    public init(_ type: TableRowActionType, handler: @escaping (_ options: TableRowActionOptions<CellType>) -> Void) {
+    public init(_ type: TableRowActionType, handler: @escaping (_ data: TableRowActionData<ItemType, CellType>) -> Void) {

        self.type = type
        self.handler = .voidAction(handler)
    }
    
-    public init(_ key: String, handler: @escaping (_ options: TableRowActionOptions<CellType>) -> Void) {
-        
-        self.type = .custom(key)
-        self.handler = .voidAction(handler)
-    }
-    
-    public init<T>(_ type: TableRowActionType, handler: @escaping (_ options: TableRowActionOptions<CellType>) -> T) {
+    public init<T>(_ type: TableRowActionType, handler: @escaping (_ data: TableRowActionData<ItemType, CellType>) -> T) {

        self.type = type
        self.handler = .action(handler)
    }

-    public func invokeActionOn(cell: UITableViewCell?, item: CellType.CellData, path: IndexPath, userInfo: [AnyHashable: Any]?) -> Any? {
-
-        return handler.invoke(withOptions: TableRowActionOptions(item: item, cell: cell as? CellType, path: path, userInfo: userInfo))
+    func invoke(item: ItemType, cell: UITableViewCell?, path: IndexPath) -> Any? {
+        return handler.invoke(item: item, cell: cell, path: path)
    }
 }
--- a/Sources/TableSection.swift
+++ b/Sources/TableSection.swift
@ -26,7 +26,6 @@ open class TableSection {
    
    open var headerTitle: String?
    open var footerTitle: String?
-    open var indexTitle: String?
    
    open var headerView: UIView?
    open var footerView: UIView?
@ -89,21 +88,6 @@ open class TableSection {
        rows[index] = row
    }
    
-    open func swap(from: Int, to: Int) {
-        rows.swapAt(from, to)
-    }
-    
-    open func delete(rowAt index: Int) {
-        rows.remove(at: index)
-    }
-    
-    open func remove(rowAt index: Int) {
-        rows.remove(at: index)
-    }
-    
-    // MARK: - deprecated methods -
-    
-    @available(*, deprecated, message: "Use 'delete(rowAt:)' method instead")
    open func delete(index: Int) {
        rows.remove(at: index)
    }
--- a/Sources/UITableViewCell+Extensions.swift
+++ b/Sources/UITableViewCell+Extensions.swift
@ -1,32 +0,0 @@
-import UIKit
-
-extension UITableViewCell {
-
-    var tableView: UITableView? {
-        var view = superview
-
-        while view != nil && !(view is UITableView) {
-            view = view?.superview
-        }
-
-        return view as? UITableView
-    }
-
-    var indexPath: IndexPath? {
-        guard let indexPath = tableView?.indexPath(for: self) else {
-            return nil
-        }
-        
-        return indexPath
-    }
-
-    public func height(layoutType: LayoutType) -> CGFloat {
-        switch layoutType {
-        case .auto:
-            return contentView.systemLayoutSizeFitting(UIView.layoutFittingCompressedSize).height
-        case .manual:
-            return contentView.subviews.map { $0.frame.maxY }.max() ?? 0
-        }
-    }
-
-}
--- a/TableKit.podspec
+++ b/TableKit.podspec
@ -2,16 +2,16 @@ Pod::Spec.new do |s|
    s.name                  = 'TableKit'
    s.module_name           = 'TableKit'

-    s.version               = '2.12'
+    s.version               = '1.3.1'

-    s.homepage              = 'https://git.svc.touchin.ru/TouchInstinct/TableKit'
+    s.homepage              = 'https://github.com/maxsokolov/TableKit'
    s.summary               = 'Type-safe declarative table views with Swift.'

    s.author                = { 'Max Sokolov' => 'i@maxsokolov.net' }
    s.license               = { :type => 'MIT', :file => 'LICENSE' }
-    s.platforms             = { :ios => '12.0' }
-    s.ios.deployment_target = '12.0'
+    s.platforms             = { :ios => '8.0' }
+    s.ios.deployment_target = '8.0'

    s.source_files          = 'Sources/*.swift'
-    s.source                = { :git => 'https://git.svc.touchin.ru/TouchInstinct/TableKit.git', :tag => s.version }
-end
+    s.source                = { :git => 'https://github.com/maxsokolov/TableKit.git', :tag => s.version }
+end
--- a/TableKit.xcodeproj/project.pbxproj
+++ b/TableKit.xcodeproj/project.pbxproj
@ -7,16 +7,9 @@
 	objects = {

 /* Begin PBXBuildFile section */
-		2CBFA2F521F692F100147B56 /* ExpandableState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CBFA2F421F692F100147B56 /* ExpandableState.swift */; };
-		3201E78421BE9DE1001DF9E7 /* ExpandableCellHeightCalculator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3201E78321BE9DE1001DF9E7 /* ExpandableCellHeightCalculator.swift */; };
-		3201E78621BE9E25001DF9E7 /* UITableViewCell+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3201E78521BE9E25001DF9E7 /* UITableViewCell+Extensions.swift */; };
-		3201E78821BE9EB2001DF9E7 /* Expandable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3201E78721BE9EB2001DF9E7 /* Expandable.swift */; };
-		3201E78A21BE9ED4001DF9E7 /* ExpandableCellViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3201E78921BE9ED4001DF9E7 /* ExpandableCellViewModel.swift */; };
-		32BDFE9F21C167F400D0BBB4 /* LayoutType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32BDFE9E21C167F400D0BBB4 /* LayoutType.swift */; };
 		50CF6E6B1D6704FE004746FF /* TableCellRegisterer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50CF6E6A1D6704FE004746FF /* TableCellRegisterer.swift */; };
-		50E858581DB153F500A9AA55 /* TableKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 50E858571DB153F500A9AA55 /* TableKit.swift */; };
 		DA9EA7AF1D0EC2C90021F650 /* ConfigurableCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA9EA7A61D0EC2C90021F650 /* ConfigurableCell.swift */; };
-		DA9EA7B01D0EC2C90021F650 /* TablePrototypeCellHeightCalculator.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA9EA7A71D0EC2C90021F650 /* TablePrototypeCellHeightCalculator.swift */; };
+		DA9EA7B01D0EC2C90021F650 /* HeightStrategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA9EA7A71D0EC2C90021F650 /* HeightStrategy.swift */; };
 		DA9EA7B11D0EC2C90021F650 /* Operators.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA9EA7A81D0EC2C90021F650 /* Operators.swift */; };
 		DA9EA7B21D0EC2C90021F650 /* TableCellAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA9EA7A91D0EC2C90021F650 /* TableCellAction.swift */; };
 		DA9EA7B31D0EC2C90021F650 /* TableDirector.swift in Sources */ = {isa = PBXBuildFile; fileRef = DA9EA7AA1D0EC2C90021F650 /* TableDirector.swift */; };
@ -38,17 +31,10 @@
 /* End PBXContainerItemProxy section */

 /* Begin PBXFileReference section */
-		2CBFA2F421F692F100147B56 /* ExpandableState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExpandableState.swift; sourceTree = "<group>"; };
-		3201E78321BE9DE1001DF9E7 /* ExpandableCellHeightCalculator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExpandableCellHeightCalculator.swift; sourceTree = "<group>"; };
-		3201E78521BE9E25001DF9E7 /* UITableViewCell+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITableViewCell+Extensions.swift"; sourceTree = "<group>"; };
-		3201E78721BE9EB2001DF9E7 /* Expandable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Expandable.swift; sourceTree = "<group>"; };
-		3201E78921BE9ED4001DF9E7 /* ExpandableCellViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExpandableCellViewModel.swift; sourceTree = "<group>"; };
-		32BDFE9E21C167F400D0BBB4 /* LayoutType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LayoutType.swift; sourceTree = "<group>"; };
 		50CF6E6A1D6704FE004746FF /* TableCellRegisterer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TableCellRegisterer.swift; sourceTree = "<group>"; };
-		50E858571DB153F500A9AA55 /* TableKit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TableKit.swift; sourceTree = "<group>"; };
 		DA9EA7561D0B679A0021F650 /* TableKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = TableKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		DA9EA7A61D0EC2C90021F650 /* ConfigurableCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConfigurableCell.swift; sourceTree = "<group>"; };
-		DA9EA7A71D0EC2C90021F650 /* TablePrototypeCellHeightCalculator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TablePrototypeCellHeightCalculator.swift; sourceTree = "<group>"; };
+		DA9EA7A71D0EC2C90021F650 /* HeightStrategy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HeightStrategy.swift; sourceTree = "<group>"; };
 		DA9EA7A81D0EC2C90021F650 /* Operators.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Operators.swift; sourceTree = "<group>"; };
 		DA9EA7A91D0EC2C90021F650 /* TableCellAction.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TableCellAction.swift; sourceTree = "<group>"; };
 		DA9EA7AA1D0EC2C90021F650 /* TableDirector.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TableDirector.swift; sourceTree = "<group>"; };
@ -102,22 +88,15 @@
 		DA9EA7A51D0EC2B90021F650 /* Sources */ = {
 			isa = PBXGroup;
 			children = (
-				DA9EA7A61D0EC2C90021F650 /* ConfigurableCell.swift */,
-				3201E78321BE9DE1001DF9E7 /* ExpandableCellHeightCalculator.swift */,
-				DA9EA7A81D0EC2C90021F650 /* Operators.swift */,
-				DA9EA7A91D0EC2C90021F650 /* TableCellAction.swift */,
-				50CF6E6A1D6704FE004746FF /* TableCellRegisterer.swift */,
 				DA9EA7AA1D0EC2C90021F650 /* TableDirector.swift */,
-				50E858571DB153F500A9AA55 /* TableKit.swift */,
-				DA9EA7A71D0EC2C90021F650 /* TablePrototypeCellHeightCalculator.swift */,
+				50CF6E6A1D6704FE004746FF /* TableCellRegisterer.swift */,
 				DA9EA7AB1D0EC2C90021F650 /* TableRow.swift */,
 				DA9EA7AC1D0EC2C90021F650 /* TableRowAction.swift */,
 				DA9EA7AE1D0EC2C90021F650 /* TableSection.swift */,
-				3201E78521BE9E25001DF9E7 /* UITableViewCell+Extensions.swift */,
-				3201E78721BE9EB2001DF9E7 /* Expandable.swift */,
-				3201E78921BE9ED4001DF9E7 /* ExpandableCellViewModel.swift */,
-				32BDFE9E21C167F400D0BBB4 /* LayoutType.swift */,
-				2CBFA2F421F692F100147B56 /* ExpandableState.swift */,
+				DA9EA7A91D0EC2C90021F650 /* TableCellAction.swift */,
+				DA9EA7A61D0EC2C90021F650 /* ConfigurableCell.swift */,
+				DA9EA7A81D0EC2C90021F650 /* Operators.swift */,
+				DA9EA7A71D0EC2C90021F650 /* HeightStrategy.swift */,
 			);
 			path = Sources;
 			sourceTree = "<group>";
@ -195,16 +174,16 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 1000;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = "Max Sokolov";
 				TargetAttributes = {
 					DA9EA7551D0B679A0021F650 = {
 						CreatedOnToolsVersion = 7.3;
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 0800;
 					};
 					DA9EA7C31D0EC45F0021F650 = {
 						CreatedOnToolsVersion = 7.3;
-						LastSwiftMigration = 1000;
+						LastSwiftMigration = 0800;
 					};
 				};
 			};
@ -213,7 +192,6 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
-				English,
 				en,
 			);
 			mainGroup = DA9EA74C1D0B679A0021F650;
@ -249,22 +227,15 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				3201E78A21BE9ED4001DF9E7 /* ExpandableCellViewModel.swift in Sources */,
 				50CF6E6B1D6704FE004746FF /* TableCellRegisterer.swift in Sources */,
 				DA9EA7AF1D0EC2C90021F650 /* ConfigurableCell.swift in Sources */,
 				DA9EA7B31D0EC2C90021F650 /* TableDirector.swift in Sources */,
-				3201E78821BE9EB2001DF9E7 /* Expandable.swift in Sources */,
-				2CBFA2F521F692F100147B56 /* ExpandableState.swift in Sources */,
 				DA9EA7B71D0EC2C90021F650 /* TableSection.swift in Sources */,
-				DA9EA7B01D0EC2C90021F650 /* TablePrototypeCellHeightCalculator.swift in Sources */,
-				3201E78421BE9DE1001DF9E7 /* ExpandableCellHeightCalculator.swift in Sources */,
+				DA9EA7B01D0EC2C90021F650 /* HeightStrategy.swift in Sources */,
 				DA9EA7B51D0EC2C90021F650 /* TableRowAction.swift in Sources */,
 				DA9EA7B21D0EC2C90021F650 /* TableCellAction.swift in Sources */,
-				32BDFE9F21C167F400D0BBB4 /* LayoutType.swift in Sources */,
-				3201E78621BE9E25001DF9E7 /* UITableViewCell+Extensions.swift in Sources */,
 				DA9EA7B11D0EC2C90021F650 /* Operators.swift in Sources */,
 				DA9EA7B41D0EC2C90021F650 /* TableRow.swift in Sources */,
-				50E858581DB153F500A9AA55 /* TableKit.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@ -296,22 +267,14 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@ -340,7 +303,6 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@ -356,22 +318,14 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@ -393,7 +347,6 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
@ -418,7 +371,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@ -438,7 +391,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.tablekit.TableKit;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
@ -450,7 +403,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.tablekit.TableKitTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@ -462,7 +415,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.tablekit.TableKitTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
--- a/TableKit.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
+++ b/TableKit.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>
--- a/TableKit.xcodeproj/xcshareddata/xcschemes/TableKit.xcscheme
+++ b/TableKit.xcodeproj/xcshareddata/xcschemes/TableKit.xcscheme
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "0800"
   version = "1.3">
   <BuildAction
      parallelizeBuildables = "YES"
--- a/Tests/TableKitTests.swift
+++ b/Tests/TableKitTests.swift
@ -66,7 +66,7 @@ class TestTableViewCell: UITableViewCell, ConfigurableCell {
    }
 }

-class TableKitTests: XCTestCase {
+class TabletTests: XCTestCase {

    var testController: TestController!

@ -74,10 +74,7 @@ class TableKitTests: XCTestCase {
        super.setUp()

        testController = TestController()
-        testController.tableView.frame = UIScreen.main.bounds
-        testController.tableView.isHidden = false
-        testController.tableView.setNeedsLayout()
-        testController.tableView.layoutIfNeeded()
+        testController.view.isHidden = false
    }

    override func tearDown() {
@ -97,7 +94,7 @@ class TableKitTests: XCTestCase {
        
        let data = TestData(title: "title")

-        let row = TableRow<TestTableViewCell>(item: data)
+        let row = TableRow<TestData, TestTableViewCell>(item: data)
        
        testController.tableDirector += row
        testController.tableView.reloadData()
@ -114,7 +111,7 @@ class TableKitTests: XCTestCase {
        
        let data = [TestData(title: "1"), TestData(title: "2"), TestData(title: "3")]
        
-        let rows: [Row] = data.map({ TableRow<TestTableViewCell>(item: $0) })
+        let rows: [Row] = data.map({ TableRow<TestData, TestTableViewCell>(item: $0) })
        
        testController.tableDirector += rows
        testController.tableView.reloadData()
@ -132,7 +129,7 @@ class TableKitTests: XCTestCase {
    
    func testTableSectionCreatesSectionWithHeaderAndFooterTitles() {
        
-        let row = TableRow<TestTableViewCell>(item: TestData(title: "title"))
+        let row = TableRow<TestData, TestTableViewCell>(item: TestData(title: "title"))
        
        let sectionHeaderTitle = "Header Title"
        let sectionFooterTitle = "Footer Title"
@ -151,7 +148,7 @@ class TableKitTests: XCTestCase {
    
    func testTableSectionCreatesSectionWithHeaderAndFooterViews() {
        
-        let row = TableRow<TestTableViewCell>(item: TestData(title: "title"))
+        let row = TableRow<TestData, TestTableViewCell>(item: TestData(title: "title"))
        
        let sectionHeaderView = UIView()
        let sectionFooterView = UIView()
@ -173,8 +170,8 @@ class TableKitTests: XCTestCase {

        let expectation = self.expectation(description: "cell action")

-        let row = TableRow<TestTableViewCell>(item: TestData(title: "title"))
-            .on(TableRowAction(.custom(TestTableViewCellOptions.CellAction)) { (data) in
+        let row = TableRow<TestData, TestTableViewCell>(item: TestData(title: "title"))
+            .action(TableRowAction(.custom(TestTableViewCellOptions.CellAction)) { (data) in
                
                XCTAssertNotNil(data.cell, "Action data should have a cell")
                
@ -193,53 +190,4 @@ class TableKitTests: XCTestCase {

        waitForExpectations(timeout: 1.0, handler: nil)
    }
-    
-    func testReplaceSectionOnExistingIndex() {
-        
-        let row1 = TableRow<TestTableViewCell>(item: TestData(title: "title1"))
-        let row2 = TableRow<TestTableViewCell>(item: TestData(title: "title2"))
-    
-        let section1 = TableSection(headerView: nil, footerView: nil, rows: nil)
-        section1 += row1
-        
-        let section2 = TableSection(headerView: nil, footerView: nil, rows: nil)
-        section2 += row2
-        
-        testController.tableDirector += section1
-        testController.tableView.reloadData()
-        
-        let cell = testController.tableView.cellForRow(at: IndexPath(row: 0, section: 0)) as? TestTableViewCell
-        XCTAssertTrue(cell?.textLabel?.text == "title1")
-        
-        testController.tableDirector.replaceSection(at: 0, with: section2)
-        testController.tableView.reloadData()
-        
-       let cell1 = testController.tableView.cellForRow(at: IndexPath(row: 0, section: 0)) as? TestTableViewCell
-        XCTAssertTrue(cell1?.textLabel?.text == "title2")
-    }
-    
-    func testReplaceSectionOnWrongIndex() {
-        
-        let row1 = TableRow<TestTableViewCell>(item: TestData(title: "title1"))
-        let row2 = TableRow<TestTableViewCell>(item: TestData(title: "title2"))
-        
-        let section1 = TableSection(headerView: nil, footerView: nil, rows: nil)
-        section1 += row1
-        
-        let section2 = TableSection(headerView: nil, footerView: nil, rows: nil)
-        section2 += row2
-        
-        testController.tableDirector += section1
-        testController.tableView.reloadData()
-        
-        let cell = testController.tableView.cellForRow(at: IndexPath(row: 0, section: 0)) as? TestTableViewCell
-        XCTAssertTrue(cell?.textLabel?.text == "title1")
-        
-        testController.tableDirector.replaceSection(at: 33, with: section2)
-        testController.tableView.reloadData()
-        
-        let cell1 = testController.tableView.cellForRow(at: IndexPath(row: 0, section: 0)) as? TestTableViewCell
-        XCTAssertTrue(cell1?.textLabel?.text == "title1")
-    }
-    
 }
 @ -1 +1 @@
 .7
 .0