     private let themeRepository: ThemeRepository
     private let settingsRepository: SettingsRepository
 
-    private let findFeedViewController: FindFeedViewController
-    private let localImportViewController: LocalImportViewController
-    private let feedViewController: FeedViewController
-    private let queryFeedViewController: QueryFeedViewController
-    private let settingsViewController: SettingsViewController
-    private let articleListController: ArticleListController
+    private let findFeedViewController: Void -> FindFeedViewController
+    private let localImportViewController: Void -> LocalImportViewController
+    private let feedViewController: Void -> FeedViewController
+    private let queryFeedViewController: Void -> QueryFeedViewController
+    private let settingsViewController: Void -> SettingsViewController
+    private let articleListController: Void -> ArticleListController
 
     // swiftlint:disable function_parameter_count
     public init(feedRepository: FeedRepository,
                 themeRepository: ThemeRepository,
                 settingsRepository: SettingsRepository,
-                findFeedViewController: FindFeedViewController,
-                localImportViewController: LocalImportViewController,
-                feedViewController: FeedViewController,
-                queryFeedViewController: QueryFeedViewController,
-                settingsViewController: SettingsViewController,
-                articleListController: ArticleListController
+                findFeedViewController: Void -> FindFeedViewController,
+                localImportViewController: Void -> LocalImportViewController,
+                feedViewController: Void -> FeedViewController,
+                queryFeedViewController: Void -> QueryFeedViewController,
+                settingsViewController: Void -> SettingsViewController,
+                articleListController: Void -> ArticleListController
         ) {
         self.feedRepository = feedRepository
         self.themeRepository = themeRepository

            feedRepository: injector.create(FeedRepository)!,
            themeRepository: injector.create(ThemeRepository)!,
            settingsRepository: injector.create(SettingsRepository)!,
            findFeedViewController: injector.create(FindFeedViewController)!,
            localImportViewController: injector.create(LocalImportViewController)!,
            feedViewController: injector.create(FeedViewController)!,
            queryFeedViewController: injector.create(QueryFeedViewController)!,
            settingsViewController: injector.create(SettingsViewController)!,
            articleListController: injector.create(ArticleListController)!
        )
    }


                let feed = self.feedAtIndexPath(indexPath)
                var viewController: UIViewController! = nil
                if feed.isQueryFeed {
                    let queryFeedViewController = self.queryFeedViewController()
                    queryFeedViewController.feed = feed
                    viewController = queryFeedViewController
                } else {
                    let feedViewController = self.feedViewController()
                    feedViewController.feed = feed
                    viewController = feedViewController
                }
                self.presentViewController(UINavigationController(rootViewController: viewController),
                    animated: true, completion: nil)
