From 9531bec8c2d5737704394772d58cea18748d4dc2 Mon Sep 17 00:00:00 2001
From: ta264 <ta264@users.noreply.github.com>
Date: Tue, 19 Jul 2022 21:08:53 +0100
Subject: [PATCH] New: Plugin support

---
 .../Blocklist/BlocklistDetailsModal.js        |   2 +-
 frontend/src/Activity/Queue/ProtocolLabel.js  |   3 +-
 frontend/src/App/AppRoutes.js                 |   6 +
 frontend/src/Commands/commandNames.js         |   2 +
 .../Builder/FilterBuilderModalContent.js      |  10 +
 .../FilterBuilderModalContentConnector.js     |  17 +-
 .../Filter/Builder/FilterBuilderRow.js        |   2 +-
 .../Builder/ProtocolFilterBuilderRowValue.js  |  18 --
 .../ProtocolFilterBuilderRowValueConnector.js |  30 +++
 .../Components/Page/Sidebar/PageSidebar.js    |   4 +
 frontend/src/Components/SignalRConnector.js   |   7 +-
 frontend/src/Components/TagList.js            |   9 +-
 frontend/src/Helpers/dragTypes.js             |   1 +
 .../InteractiveSearch/InteractiveSearchRow.js |   2 +-
 .../AddDownloadClientModalContent.js          |  49 +++--
 .../AddDownloadClientModalContentConnector.js |   9 +-
 .../Indexers/AddIndexerModalContent.js        |  49 +++--
 .../AddIndexerModalContentConnector.js        |   9 +-
 .../Settings/Profiles/Delay/DelayProfile.css  |   6 +-
 .../Profiles/Delay/DelayProfile.css.d.ts      |   3 +-
 .../Settings/Profiles/Delay/DelayProfile.js   |  62 +++---
 .../Profiles/Delay/DelayProfileItem.js        |  43 ++++
 .../Settings/Profiles/Delay/DelayProfiles.css |   8 +-
 .../Profiles/Delay/DelayProfiles.css.d.ts     |   5 +-
 .../Settings/Profiles/Delay/DelayProfiles.js  |  16 +-
 .../Profiles/Delay/DownloadProtocolItem.css   |  82 ++++++++
 .../Delay/DownloadProtocolItem.css.d.ts       |  19 ++
 .../Profiles/Delay/DownloadProtocolItem.js    | 113 +++++++++++
 .../Delay/DownloadProtocolItemDragPreview.css |   4 +
 .../DownloadProtocolItemDragPreview.css.d.ts  |   7 +
 .../Delay/DownloadProtocolItemDragPreview.js  |  89 +++++++++
 .../Delay/DownloadProtocolItemDragSource.css  |  18 ++
 .../DownloadProtocolItemDragSource.css.d.ts   |  10 +
 .../Delay/DownloadProtocolItemDragSource.js   | 188 +++++++++++++++++
 .../Profiles/Delay/DownloadProtocolItems.css  |  24 +++
 .../Delay/DownloadProtocolItems.css.d.ts      |  10 +
 .../Profiles/Delay/DownloadProtocolItems.js   | 150 ++++++++++++++
 .../Delay/EditDelayProfileModalContent.js     | 119 +++--------
 .../EditDelayProfileModalContentConnector.js  | 189 +++++++++---------
 .../Tags/Details/TagDetailsDelayProfile.css   |  15 ++
 .../Details/TagDetailsDelayProfile.css.d.ts   |   9 +
 .../Tags/Details/TagDetailsDelayProfile.js    |  53 ++---
 .../Settings/Tags/Details/TagDetailsModal.js  |   2 +-
 .../Tags/Details/TagDetailsModalContent.js    |  14 +-
 .../Store/Actions/Settings/delayProfiles.js   |   4 +
 frontend/src/Store/Actions/appActions.js      |  10 +
 frontend/src/Store/Actions/systemActions.js   |  12 ++
 frontend/src/System/Plugins/PluginRow.css     |  11 +
 .../src/System/Plugins/PluginRow.css.d.ts     |   8 +
 frontend/src/System/Plugins/PluginRow.js      |  79 ++++++++
 frontend/src/System/Plugins/Plugins.css       |   6 +
 frontend/src/System/Plugins/Plugins.js        | 168 ++++++++++++++++
 .../src/System/Plugins/PluginsConnector.js    |  95 +++++++++
 .../Blocklist/BlocklistResource.cs            |   3 +-
 .../Commands/CommandController.cs             |   3 +-
 .../DownloadClient/DownloadClientResource.cs  |   3 +-
 src/Lidarr.Api.V1/Indexers/IndexerResource.cs |   2 +-
 src/Lidarr.Api.V1/Indexers/ReleaseResource.cs |   4 +-
 .../Profiles/Delay/DelayProfileController.cs  |  13 +-
 .../Delay/DelayProfileProtocolItemResource.cs |  47 +++++
 .../Profiles/Delay/DelayProfileResource.cs    |  24 +--
 .../Delay/DelayProfileSchemaController.cs     |  22 ++
 src/Lidarr.Api.V1/ProviderResource.cs         |   2 +-
 src/Lidarr.Api.V1/Queue/QueueController.cs    |   9 +-
 src/Lidarr.Api.V1/Queue/QueueResource.cs      |   3 +-
 .../System/Plugins/PluginController.cs        |  24 +++
 .../System/Plugins/PluginResource.cs          |  38 ++++
 .../ReflectionExtensionFixture.cs             |   5 +-
 .../ServiceFactoryFixture.cs                  |   5 +-
 .../Composition/AssemblyLoader.cs             |  27 ++-
 src/NzbDrone.Common/Composition/Extensions.cs |  17 +-
 .../Composition/PluginLoadContext.cs          |  41 ++++
 .../Composition/PluginLoader.cs               |  81 ++++++++
 .../Composition/PluginStatus.cs               |   7 +
 .../Extensions/PathExtensions.cs              |  21 ++
 .../Reflection/ReflectionExtensions.cs        |  32 ++-
 .../Blocklisting/BlocklistServiceFixture.cs   |   7 +-
 .../AlreadyImportedSpecificationFixture.cs    |   8 +-
 .../MinimumAgeSpecificationFixture.cs         |   2 +-
 .../PrioritizeDownloadDecisionFixture.cs      |  40 ++--
 .../ProtocolSpecificationFixture.cs           |  18 +-
 .../RawDiskSpecificationFixture.cs            |   2 +-
 .../RetentionSpecificationFixture.cs          |   4 +-
 .../RssSync/DelaySpecificationFixture.cs      |  30 ++-
 .../DownloadApprovedFixture.cs                |  12 +-
 .../Download/DownloadClientProviderFixture.cs | 100 ++++-----
 .../Download/DownloadServiceFixture.cs        |  12 +-
 .../TrackedDownloadServiceFixture.cs          |  10 +-
 .../Checks/RemotePathMappingCheckFixture.cs   |   8 +-
 .../HistoryTests/HistoryServiceFixture.cs     |   2 +-
 .../FileListTests/FileListFixture.cs          |   2 +-
 .../GazelleTests/GazelleFixture.cs            |   2 +-
 .../HeadphonesTests/HeadphonesFixture.cs      |   2 +-
 .../IPTorrentsTests/IPTorrentsFixture.cs      |   2 +-
 .../IndexerIntegrationTests.cs                |   2 +-
 .../NewznabTests/NewznabFixture.cs            |   2 +-
 .../IndexerTests/NyaaTests/NyaaFixture.cs     |   4 +-
 .../RedactedTests/RedactedFixture.cs          |   2 +-
 .../IndexerTests/SeedConfigProviderFixture.cs |   4 +-
 .../IndexerTests/TestIndexer.cs               |   2 +-
 .../TorrentRssIndexerFixture.cs               |  20 +-
 .../TorrentleechTests/TorrentleechFixture.cs  |   2 +-
 .../TorznabTests/TorznabFixture.cs            |   4 +-
 src/NzbDrone.Core/Blocklisting/Blocklist.cs   |   3 +-
 .../Blocklisting/BlocklistService.cs          | 124 ++----------
 .../Blocklisting/IBlocklistForProtocol.cs     |  12 ++
 .../Blocklisting/TorrentBlocklist.cs          |  69 +++++++
 .../Blocklisting/UsenetBlocklist.cs           |  96 +++++++++
 .../Migration/043_flexible_delay_profiles.cs  | 146 ++++++++++++++
 .../046_convert_blacklist_protocol.cs         |  21 ++
 .../Migration/052_download_history.cs         |  26 ++-
 src/NzbDrone.Core/Datastore/TableMapping.cs   |   4 +-
 .../DownloadDecisionComparer.cs               |  15 +-
 .../AlreadyImportedSpecification.cs           |   2 +-
 .../Specifications/MinimumAgeSpecification.cs |   3 +-
 .../Specifications/ProtocolSpecification.cs   |  14 +-
 .../Specifications/RetentionSpecification.cs  |   3 +-
 .../RssSync/DelaySpecification.cs             |   2 +-
 .../Download/Clients/Pneumatic/Pneumatic.cs   |   2 +-
 .../Download/DownloadClientBase.cs            |   2 +-
 .../Download/DownloadClientDefinition.cs      |   3 +-
 .../Download/DownloadClientItem.cs            |   3 +-
 .../Download/DownloadClientProvider.cs        |   4 +-
 .../Download/DownloadClientRepository.cs      |   9 +-
 .../Download/History/DownloadHistory.cs       |   3 +-
 src/NzbDrone.Core/Download/IDownloadClient.cs |   2 +-
 .../Download/Pending/PendingReleaseService.cs |   9 +-
 .../Download/ProcessDownloadDecisions.cs      |   8 +-
 .../Download/TorrentClientBase.cs             |   2 +-
 .../TrackedDownloads/TrackedDownload.cs       |   3 +-
 .../Download/UsenetClientBase.cs              |   2 +-
 .../Extras/Metadata/MetadataRepository.cs     |   9 +-
 .../HealthCheck/Checks/PluginCheck.cs         |  26 +++
 .../History/EntityHistoryService.cs           |   2 +-
 .../ImportLists/ImportListRepository.cs       |   7 +-
 .../Indexers/DownloadProtocol.cs              |  13 +-
 .../Indexers/FileList/FileList.cs             |   2 +-
 src/NzbDrone.Core/Indexers/Gazelle/Gazelle.cs |   4 +-
 .../Indexers/Headphones/Headphones.cs         |   2 +-
 src/NzbDrone.Core/Indexers/IIndexer.cs        |   2 +-
 .../Indexers/IPTorrents/IPTorrents.cs         |   2 +-
 src/NzbDrone.Core/Indexers/IndexerBase.cs     |   2 +-
 .../Indexers/IndexerDefinition.cs             |   2 +-
 .../Indexers/IndexerRepository.cs             |   9 +-
 src/NzbDrone.Core/Indexers/Newznab/Newznab.cs |   4 +-
 src/NzbDrone.Core/Indexers/Nyaa/Nyaa.cs       |   2 +-
 .../Indexers/Redacted/Redacted.cs             |   2 +-
 .../Indexers/SeedConfigProvider.cs            |   2 +-
 .../Indexers/TorrentRss/TorrentRssIndexer.cs  |   2 +-
 .../Indexers/Torrentleech/Torrentleech.cs     |   2 +-
 src/NzbDrone.Core/Indexers/Torznab/Torznab.cs |   4 +-
 src/NzbDrone.Core/Lidarr.Core.csproj          |   5 +-
 .../Notifications/NotificationRepository.cs   |   7 +-
 src/NzbDrone.Core/Parser/Model/ReleaseInfo.cs |   3 +-
 .../Plugins/Commands/InstallPluginCommand.cs  |  13 ++
 .../Commands/UninstallPluginCommand.cs        |  13 ++
 .../Plugins/InstallPluginService.cs           | 105 ++++++++++
 src/NzbDrone.Core/Plugins/Plugin.cs           |  32 +++
 src/NzbDrone.Core/Plugins/PluginService.cs    | 117 +++++++++++
 .../Plugins/Resources/GithubRelease.cs        |  58 ++++++
 .../Profiles/Delay/DelayProfile.cs            |  38 +++-
 .../Delay/DelayProfileProtocolItem.cs         |  12 ++
 .../Profiles/Delay/DelayProfileService.cs     |  46 ++++-
 src/NzbDrone.Core/Queue/Queue.cs              |   3 +-
 .../ThingiProvider/ProviderRepository.cs      |  17 +-
 src/NzbDrone.Host.Test/ContainerFixture.cs    |   5 +-
 src/NzbDrone.Host/Bootstrap.cs                | 179 ++++++++++++-----
 .../ApiTests/PluginFixture.cs                 | 121 +++++++++++
 .../IntegrationTest.cs                        |   2 +-
 .../IntegrationTestBase.cs                    |   3 +
 src/NzbDrone.Update/UpdateApp.cs              |   5 +-
 171 files changed, 3264 insertions(+), 830 deletions(-)
 delete mode 100644 frontend/src/Components/Filter/Builder/ProtocolFilterBuilderRowValue.js
 create mode 100644 frontend/src/Components/Filter/Builder/ProtocolFilterBuilderRowValueConnector.js
 create mode 100644 frontend/src/Settings/Profiles/Delay/DelayProfileItem.js
 create mode 100644 frontend/src/Settings/Profiles/Delay/DownloadProtocolItem.css
 create mode 100644 frontend/src/Settings/Profiles/Delay/DownloadProtocolItem.css.d.ts
 create mode 100644 frontend/src/Settings/Profiles/Delay/DownloadProtocolItem.js
 create mode 100644 frontend/src/Settings/Profiles/Delay/DownloadProtocolItemDragPreview.css
 create mode 100644 frontend/src/Settings/Profiles/Delay/DownloadProtocolItemDragPreview.css.d.ts
 create mode 100644 frontend/src/Settings/Profiles/Delay/DownloadProtocolItemDragPreview.js
 create mode 100644 frontend/src/Settings/Profiles/Delay/DownloadProtocolItemDragSource.css
 create mode 100644 frontend/src/Settings/Profiles/Delay/DownloadProtocolItemDragSource.css.d.ts
 create mode 100644 frontend/src/Settings/Profiles/Delay/DownloadProtocolItemDragSource.js
 create mode 100644 frontend/src/Settings/Profiles/Delay/DownloadProtocolItems.css
 create mode 100644 frontend/src/Settings/Profiles/Delay/DownloadProtocolItems.css.d.ts
 create mode 100644 frontend/src/Settings/Profiles/Delay/DownloadProtocolItems.js
 create mode 100644 frontend/src/Settings/Tags/Details/TagDetailsDelayProfile.css
 create mode 100644 frontend/src/Settings/Tags/Details/TagDetailsDelayProfile.css.d.ts
 create mode 100644 frontend/src/System/Plugins/PluginRow.css
 create mode 100644 frontend/src/System/Plugins/PluginRow.css.d.ts
 create mode 100644 frontend/src/System/Plugins/PluginRow.js
 create mode 100644 frontend/src/System/Plugins/Plugins.css
 create mode 100644 frontend/src/System/Plugins/Plugins.js
 create mode 100644 frontend/src/System/Plugins/PluginsConnector.js
 create mode 100644 src/Lidarr.Api.V1/Profiles/Delay/DelayProfileProtocolItemResource.cs
 create mode 100644 src/Lidarr.Api.V1/Profiles/Delay/DelayProfileSchemaController.cs
 create mode 100644 src/Lidarr.Api.V1/System/Plugins/PluginController.cs
 create mode 100644 src/Lidarr.Api.V1/System/Plugins/PluginResource.cs
 create mode 100644 src/NzbDrone.Common/Composition/PluginLoadContext.cs
 create mode 100644 src/NzbDrone.Common/Composition/PluginLoader.cs
 create mode 100644 src/NzbDrone.Common/Composition/PluginStatus.cs
 create mode 100644 src/NzbDrone.Core/Blocklisting/IBlocklistForProtocol.cs
 create mode 100644 src/NzbDrone.Core/Blocklisting/TorrentBlocklist.cs
 create mode 100644 src/NzbDrone.Core/Blocklisting/UsenetBlocklist.cs
 create mode 100644 src/NzbDrone.Core/Datastore/Migration/043_flexible_delay_profiles.cs
 create mode 100644 src/NzbDrone.Core/Datastore/Migration/046_convert_blacklist_protocol.cs
 create mode 100644 src/NzbDrone.Core/HealthCheck/Checks/PluginCheck.cs
 create mode 100644 src/NzbDrone.Core/Plugins/Commands/InstallPluginCommand.cs
 create mode 100644 src/NzbDrone.Core/Plugins/Commands/UninstallPluginCommand.cs
 create mode 100644 src/NzbDrone.Core/Plugins/InstallPluginService.cs
 create mode 100644 src/NzbDrone.Core/Plugins/Plugin.cs
 create mode 100644 src/NzbDrone.Core/Plugins/PluginService.cs
 create mode 100644 src/NzbDrone.Core/Plugins/Resources/GithubRelease.cs
 create mode 100644 src/NzbDrone.Core/Profiles/Delay/DelayProfileProtocolItem.cs
 create mode 100644 src/NzbDrone.Integration.Test/ApiTests/PluginFixture.cs

diff --git a/frontend/src/Activity/Blocklist/BlocklistDetailsModal.js b/frontend/src/Activity/Blocklist/BlocklistDetailsModal.js
index 506fa0129..a1d3131d4 100644
--- a/frontend/src/Activity/Blocklist/BlocklistDetailsModal.js
+++ b/frontend/src/Activity/Blocklist/BlocklistDetailsModal.js
@@ -46,7 +46,7 @@ class BlocklistDetailsModal extends Component {
 
               <DescriptionListItem
                 title={translate('Protocol')}
-                data={protocol}
+                data={protocol.replace('DownloadProtocol', '')}
               />
 
               {
diff --git a/frontend/src/Activity/Queue/ProtocolLabel.js b/frontend/src/Activity/Queue/ProtocolLabel.js
index e8a08943c..ae0534f7a 100644
--- a/frontend/src/Activity/Queue/ProtocolLabel.js
+++ b/frontend/src/Activity/Queue/ProtocolLabel.js
@@ -4,7 +4,8 @@ import Label from 'Components/Label';
 import styles from './ProtocolLabel.css';
 
 function ProtocolLabel({ protocol }) {
-  const protocolName = protocol === 'usenet' ? 'nzb' : protocol;
+  const strippedName = protocol.replace('DownloadProtocol', '').toLowerCase();
+  const protocolName = strippedName === 'usenet' ? 'nzb' : strippedName;
 
   return (
     <Label className={styles[protocol]}>
diff --git a/frontend/src/App/AppRoutes.js b/frontend/src/App/AppRoutes.js
index c1004d36d..e4acd3bcf 100644
--- a/frontend/src/App/AppRoutes.js
+++ b/frontend/src/App/AppRoutes.js
@@ -27,6 +27,7 @@ import UISettingsConnector from 'Settings/UI/UISettingsConnector';
 import BackupsConnector from 'System/Backup/BackupsConnector';
 import LogsTableConnector from 'System/Events/LogsTableConnector';
 import Logs from 'System/Logs/Logs';
+import PluginsConnector from 'System/Plugins/PluginsConnector';
 import Status from 'System/Status/Status';
 import Tasks from 'System/Tasks/Tasks';
 import Updates from 'System/Updates/Updates';
@@ -251,6 +252,11 @@ function AppRoutes(props) {
         component={Updates}
       />
 
+      <Route
+        path="/system/plugins"
+        component={PluginsConnector}
+      />
+
       <Route
         path="/system/events"
         component={LogsTableConnector}
diff --git a/frontend/src/Commands/commandNames.js b/frontend/src/Commands/commandNames.js
index b8ee54956..9203edd57 100644
--- a/frontend/src/Commands/commandNames.js
+++ b/frontend/src/Commands/commandNames.js
@@ -8,6 +8,7 @@ export const DELETE_LOG_FILES = 'DeleteLogFiles';
 export const DELETE_UPDATE_LOG_FILES = 'DeleteUpdateLogFiles';
 export const DOWNLOADED_ALBUMS_SCAN = 'DownloadedAlbumsScan';
 export const ALBUM_SEARCH = 'AlbumSearch';
+export const INSTALL_PLUGIN = 'InstallPlugin';
 export const INTERACTIVE_IMPORT = 'ManualImport';
 export const MISSING_ALBUM_SEARCH = 'MissingAlbumSearch';
 export const MOVE_ARTIST = 'MoveArtist';
@@ -22,3 +23,4 @@ export const RESET_QUALITY_DEFINITIONS = 'ResetQualityDefinitions';
 export const RSS_SYNC = 'RssSync';
 export const SEASON_SEARCH = 'AlbumSearch';
 export const ARTIST_SEARCH = 'ArtistSearch';
+export const UNINSTALL_PLUGIN = 'UninstallPlugin';
diff --git a/frontend/src/Components/Filter/Builder/FilterBuilderModalContent.js b/frontend/src/Components/Filter/Builder/FilterBuilderModalContent.js
index 0c4a31657..de29a2699 100644
--- a/frontend/src/Components/Filter/Builder/FilterBuilderModalContent.js
+++ b/frontend/src/Components/Filter/Builder/FilterBuilderModalContent.js
@@ -37,6 +37,13 @@ class FilterBuilderModalContent extends Component {
     };
   }
 
+  componentDidMount() {
+    if (!this.props.isPopulated) {
+      this.props.dispatchFetchDownloadClients();
+      this.props.dispatchFetchIndexers();
+    }
+  }
+
   componentDidUpdate(prevProps) {
     const {
       id,
@@ -222,9 +229,12 @@ FilterBuilderModalContent.propTypes = {
   customFilters: PropTypes.arrayOf(PropTypes.object).isRequired,
   isSaving: PropTypes.bool.isRequired,
   saveError: PropTypes.object,
+  isPopulated: PropTypes.bool.isRequired,
   dispatchDeleteCustomFilter: PropTypes.func.isRequired,
   onSaveCustomFilterPress: PropTypes.func.isRequired,
   dispatchSetFilter: PropTypes.func.isRequired,
+  dispatchFetchDownloadClients: PropTypes.func.isRequired,
+  dispatchFetchIndexers: PropTypes.func.isRequired,
   onCancelPress: PropTypes.func.isRequired,
   onModalClose: PropTypes.func.isRequired
 };
diff --git a/frontend/src/Components/Filter/Builder/FilterBuilderModalContentConnector.js b/frontend/src/Components/Filter/Builder/FilterBuilderModalContentConnector.js
index 17633172b..d45b2f3f2 100644
--- a/frontend/src/Components/Filter/Builder/FilterBuilderModalContentConnector.js
+++ b/frontend/src/Components/Filter/Builder/FilterBuilderModalContentConnector.js
@@ -1,6 +1,7 @@
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
 import { deleteCustomFilter, saveCustomFilter } from 'Store/Actions/customFilterActions';
+import { fetchDownloadClients, fetchIndexers } from 'Store/Actions/settingsActions';
 import FilterBuilderModalContent from './FilterBuilderModalContent';
 
 function createMapStateToProps() {
@@ -9,7 +10,11 @@ function createMapStateToProps() {
     (state, { id }) => id,
     (state) => state.customFilters.isSaving,
     (state) => state.customFilters.saveError,
-    (customFilters, id, isSaving, saveError) => {
+    (state) => state.settings.downloadClients.isPopulated,
+    (state) => state.settings.indexers.isPopulated,
+    (customFilters, id, isSaving, saveError, downloadClientsPopulated, indexersPopulated) => {
+      const isPopulated = downloadClientsPopulated && indexersPopulated;
+
       if (id) {
         const customFilter = customFilters.find((c) => c.id === id);
 
@@ -19,7 +24,8 @@ function createMapStateToProps() {
           filters: customFilter.filters,
           customFilters,
           isSaving,
-          saveError
+          saveError,
+          isPopulated
         };
       }
 
@@ -28,7 +34,8 @@ function createMapStateToProps() {
         filters: [],
         customFilters,
         isSaving,
-        saveError
+        saveError,
+        isPopulated
       };
     }
   );
@@ -36,7 +43,9 @@ function createMapStateToProps() {
 
 const mapDispatchToProps = {
   onSaveCustomFilterPress: saveCustomFilter,
-  dispatchDeleteCustomFilter: deleteCustomFilter
+  dispatchDeleteCustomFilter: deleteCustomFilter,
+  dispatchFetchDownloadClients: fetchDownloadClients,
+  dispatchFetchIndexers: fetchIndexers
 };
 
 export default connect(createMapStateToProps, mapDispatchToProps)(FilterBuilderModalContent);
diff --git a/frontend/src/Components/Filter/Builder/FilterBuilderRow.js b/frontend/src/Components/Filter/Builder/FilterBuilderRow.js
index 77dad7173..0a843ed22 100644
--- a/frontend/src/Components/Filter/Builder/FilterBuilderRow.js
+++ b/frontend/src/Components/Filter/Builder/FilterBuilderRow.js
@@ -13,7 +13,7 @@ import HistoryEventTypeFilterBuilderRowValue from './HistoryEventTypeFilterBuild
 import IndexerFilterBuilderRowValueConnector from './IndexerFilterBuilderRowValueConnector';
 import MetadataProfileFilterBuilderRowValue from './MetadataProfileFilterBuilderRowValue';
 import MonitorNewItemsFilterBuilderRowValue from './MonitorNewItemsFilterBuilderRowValue';
-import ProtocolFilterBuilderRowValue from './ProtocolFilterBuilderRowValue';
+import ProtocolFilterBuilderRowValue from './ProtocolFilterBuilderRowValueConnector';
 import QualityFilterBuilderRowValueConnector from './QualityFilterBuilderRowValueConnector';
 import QualityProfileFilterBuilderRowValue from './QualityProfileFilterBuilderRowValue';
 import TagFilterBuilderRowValueConnector from './TagFilterBuilderRowValueConnector';
diff --git a/frontend/src/Components/Filter/Builder/ProtocolFilterBuilderRowValue.js b/frontend/src/Components/Filter/Builder/ProtocolFilterBuilderRowValue.js
deleted file mode 100644
index ae63ae0eb..000000000
--- a/frontend/src/Components/Filter/Builder/ProtocolFilterBuilderRowValue.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import React from 'react';
-import FilterBuilderRowValue from './FilterBuilderRowValue';
-
-const protocols = [
-  { id: 'torrent', name: 'Torrent' },
-  { id: 'usenet', name: 'Usenet' }
-];
-
-function ProtocolFilterBuilderRowValue(props) {
-  return (
-    <FilterBuilderRowValue
-      tagList={protocols}
-      {...props}
-    />
-  );
-}
-
-export default ProtocolFilterBuilderRowValue;
diff --git a/frontend/src/Components/Filter/Builder/ProtocolFilterBuilderRowValueConnector.js b/frontend/src/Components/Filter/Builder/ProtocolFilterBuilderRowValueConnector.js
new file mode 100644
index 000000000..c5bd3aa52
--- /dev/null
+++ b/frontend/src/Components/Filter/Builder/ProtocolFilterBuilderRowValueConnector.js
@@ -0,0 +1,30 @@
+import { connect } from 'react-redux';
+import { createSelector } from 'reselect';
+import FilterBuilderRowValue from './FilterBuilderRowValue';
+
+function createMapStateToProps() {
+  return createSelector(
+    (state) => state.settings.downloadClients,
+    (state) => state.settings.indexers,
+    (downloadClients, indexers) => {
+      const protocols = Array.from(new Set([
+        ...downloadClients.items.map((i) => i.protocol),
+        ...indexers.items.map((i) => i.protocol)
+      ]));
+
+      console.log(protocols);
+      const tagList = protocols.map((protocol) => {
+        return {
+          id: protocol,
+          name: protocol.replace('DownloadProtocol', '')
+        };
+      });
+
+      return {
+        tagList
+      };
+    }
+  );
+}
+
+export default connect(createMapStateToProps)(FilterBuilderRowValue);
diff --git a/frontend/src/Components/Page/Sidebar/PageSidebar.js b/frontend/src/Components/Page/Sidebar/PageSidebar.js
index d6db8d612..d559ae698 100644
--- a/frontend/src/Components/Page/Sidebar/PageSidebar.js
+++ b/frontend/src/Components/Page/Sidebar/PageSidebar.js
@@ -157,6 +157,10 @@ const links = [
         title: () => translate('Updates'),
         to: '/system/updates'
       },
+      {
+        title: () => translate('Plugins'),
+        to: '/system/plugins'
+      },
       {
         title: () => translate('Events'),
         to: '/system/events'
diff --git a/frontend/src/Components/SignalRConnector.js b/frontend/src/Components/SignalRConnector.js
index db631de6f..cca44a10d 100644
--- a/frontend/src/Components/SignalRConnector.js
+++ b/frontend/src/Components/SignalRConnector.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
-import { setAppValue, setVersion } from 'Store/Actions/appActions';
+import { clearMessages, setAppValue, setVersion } from 'Store/Actions/appActions';
 import { fetchArtist } from 'Store/Actions/artistActions';
 import { removeItem, update, updateItem } from 'Store/Actions/baseActions';
 import { fetchCommands, finishCommand, updateCommand } from 'Store/Actions/commandActions';
@@ -40,6 +40,7 @@ const mapDispatchToProps = {
   dispatchFetchCommands: fetchCommands,
   dispatchUpdateCommand: updateCommand,
   dispatchFinishCommand: finishCommand,
+  dispatchClearMessages: clearMessages,
   dispatchSetAppValue: setAppValue,
   dispatchSetVersion: setVersion,
   dispatchUpdate: update,
@@ -340,6 +341,7 @@ class SignalRConnector extends Component {
     const {
       dispatchFetchCommands,
       dispatchFetchArtist,
+      dispatchClearMessages,
       dispatchSetAppValue
     } = this.props;
 
@@ -353,7 +355,9 @@ class SignalRConnector extends Component {
     // Repopulate the page (if a repopulator is set) to ensure things
     // are in sync after reconnecting.
     dispatchFetchArtist();
+    dispatchClearMessages();
     dispatchFetchCommands();
+
     repopulatePage();
   };
 
@@ -382,6 +386,7 @@ SignalRConnector.propTypes = {
   dispatchFetchCommands: PropTypes.func.isRequired,
   dispatchUpdateCommand: PropTypes.func.isRequired,
   dispatchFinishCommand: PropTypes.func.isRequired,
+  dispatchClearMessages: PropTypes.func.isRequired,
   dispatchSetAppValue: PropTypes.func.isRequired,
   dispatchSetVersion: PropTypes.func.isRequired,
   dispatchUpdate: PropTypes.func.isRequired,
diff --git a/frontend/src/Components/TagList.js b/frontend/src/Components/TagList.js
index fe700b8fe..5a0fcac48 100644
--- a/frontend/src/Components/TagList.js
+++ b/frontend/src/Components/TagList.js
@@ -5,14 +5,14 @@ import sortByProp from 'Utilities/Array/sortByProp';
 import Label from './Label';
 import styles from './TagList.css';
 
-function TagList({ tags, tagList }) {
+function TagList({ className, tags, tagList }) {
   const sortedTags = tags
     .map((tagId) => tagList.find((tag) => tag.id === tagId))
     .filter((tag) => !!tag)
     .sort(sortByProp('label'));
 
   return (
-    <div className={styles.tags}>
+    <div className={className}>
       {
         sortedTags.map((tag) => {
           return (
@@ -30,8 +30,13 @@ function TagList({ tags, tagList }) {
 }
 
 TagList.propTypes = {
+  className: PropTypes.string.isRequired,
   tags: PropTypes.arrayOf(PropTypes.number).isRequired,
   tagList: PropTypes.arrayOf(PropTypes.object).isRequired
 };
 
+TagList.defaultProps = {
+  className: styles.tags
+};
+
 export default TagList;
diff --git a/frontend/src/Helpers/dragTypes.js b/frontend/src/Helpers/dragTypes.js
index ed6ba080d..04f55ead6 100644
--- a/frontend/src/Helpers/dragTypes.js
+++ b/frontend/src/Helpers/dragTypes.js
@@ -1,3 +1,4 @@
 export const QUALITY_PROFILE_ITEM = 'qualityProfileItem';
 export const DELAY_PROFILE = 'delayProfile';
+export const DOWNLOAD_PROTOCOL_ITEM = 'downloadProtocolItem';
 export const TABLE_COLUMN = 'tableColumn';
diff --git a/frontend/src/InteractiveSearch/InteractiveSearchRow.js b/frontend/src/InteractiveSearch/InteractiveSearchRow.js
index a139f8085..cb29e41f7 100644
--- a/frontend/src/InteractiveSearch/InteractiveSearchRow.js
+++ b/frontend/src/InteractiveSearch/InteractiveSearchRow.js
@@ -171,7 +171,7 @@ class InteractiveSearchRow extends Component {
 
         <TableRowCell className={styles.peers}>
           {
-            protocol === 'torrent' &&
+            protocol === 'TorrentDownloadProtocol' &&
               <Peers
                 seeders={seeders}
                 leechers={leechers}
diff --git a/frontend/src/Settings/DownloadClients/DownloadClients/AddDownloadClientModalContent.js b/frontend/src/Settings/DownloadClients/DownloadClients/AddDownloadClientModalContent.js
index 7bb61b01f..e8fea0e71 100644
--- a/frontend/src/Settings/DownloadClients/DownloadClients/AddDownloadClientModalContent.js
+++ b/frontend/src/Settings/DownloadClients/DownloadClients/AddDownloadClientModalContent.js
@@ -13,6 +13,19 @@ import translate from 'Utilities/String/translate';
 import AddDownloadClientItem from './AddDownloadClientItem';
 import styles from './AddDownloadClientModalContent.css';
 
+function mapDownloadClients(clients, onDownloadClientSelect) {
+  return clients.map((downloadClient) => {
+    return (
+      <AddDownloadClientItem
+        key={downloadClient.implementation}
+        implementation={downloadClient.implementation}
+        {...downloadClient}
+        onDownloadClientSelect={onDownloadClientSelect}
+      />
+    );
+  });
+}
+
 class AddDownloadClientModalContent extends Component {
 
   //
@@ -25,6 +38,7 @@ class AddDownloadClientModalContent extends Component {
       schemaError,
       usenetDownloadClients,
       torrentDownloadClients,
+      otherDownloadClients,
       onDownloadClientSelect,
       onModalClose
     } = this.props;
@@ -64,16 +78,7 @@ class AddDownloadClientModalContent extends Component {
                 <FieldSet legend={translate('Usenet')}>
                   <div className={styles.downloadClients}>
                     {
-                      usenetDownloadClients.map((downloadClient) => {
-                        return (
-                          <AddDownloadClientItem
-                            key={downloadClient.implementation}
-                            implementation={downloadClient.implementation}
-                            {...downloadClient}
-                            onDownloadClientSelect={onDownloadClientSelect}
-                          />
-                        );
-                      })
+                      mapDownloadClients(usenetDownloadClients, onDownloadClientSelect)
                     }
                   </div>
                 </FieldSet>
@@ -81,19 +86,22 @@ class AddDownloadClientModalContent extends Component {
                 <FieldSet legend={translate('Torrents')}>
                   <div className={styles.downloadClients}>
                     {
-                      torrentDownloadClients.map((downloadClient) => {
-                        return (
-                          <AddDownloadClientItem
-                            key={downloadClient.implementation}
-                            implementation={downloadClient.implementation}
-                            {...downloadClient}
-                            onDownloadClientSelect={onDownloadClientSelect}
-                          />
-                        );
-                      })
+                      mapDownloadClients(torrentDownloadClients, onDownloadClientSelect)
                     }
                   </div>
                 </FieldSet>
+
+                {
+                  otherDownloadClients.length ?
+                    <FieldSet legend="Other">
+                      <div className={styles.downloadClients}>
+                        {
+                          mapDownloadClients(otherDownloadClients, onDownloadClientSelect)
+                        }
+                      </div>
+                    </FieldSet> :
+                    null
+                }
               </div>
           }
         </ModalBody>
@@ -115,6 +123,7 @@ AddDownloadClientModalContent.propTypes = {
   schemaError: PropTypes.object,
   usenetDownloadClients: PropTypes.arrayOf(PropTypes.object).isRequired,
   torrentDownloadClients: PropTypes.arrayOf(PropTypes.object).isRequired,
+  otherDownloadClients: PropTypes.arrayOf(PropTypes.object).isRequired,
   onDownloadClientSelect: PropTypes.func.isRequired,
   onModalClose: PropTypes.func.isRequired
 };
diff --git a/frontend/src/Settings/DownloadClients/DownloadClients/AddDownloadClientModalContentConnector.js b/frontend/src/Settings/DownloadClients/DownloadClients/AddDownloadClientModalContentConnector.js
index ffae3eee9..bb08219f8 100644
--- a/frontend/src/Settings/DownloadClients/DownloadClients/AddDownloadClientModalContentConnector.js
+++ b/frontend/src/Settings/DownloadClients/DownloadClients/AddDownloadClientModalContentConnector.js
@@ -17,15 +17,18 @@ function createMapStateToProps() {
         schema
       } = downloadClients;
 
-      const usenetDownloadClients = _.filter(schema, { protocol: 'usenet' });
-      const torrentDownloadClients = _.filter(schema, { protocol: 'torrent' });
+      const usenetDownloadClients = _.filter(schema, { protocol: 'UsenetDownloadProtocol' });
+      const torrentDownloadClients = _.filter(schema, { protocol: 'TorrentDownloadProtocol' });
+      const otherDownloadClients = _.filter(schema, (x) => x.protocol !== 'UsenetDownloadProtocol' &&
+          x.protocol !== 'TorrentDownloadProtocol');
 
       return {
         isSchemaFetching,
         isSchemaPopulated,
         schemaError,
         usenetDownloadClients,
-        torrentDownloadClients
+        torrentDownloadClients,
+        otherDownloadClients
       };
     }
   );
diff --git a/frontend/src/Settings/Indexers/Indexers/AddIndexerModalContent.js b/frontend/src/Settings/Indexers/Indexers/AddIndexerModalContent.js
index 65c4a629e..1f9a09747 100644
--- a/frontend/src/Settings/Indexers/Indexers/AddIndexerModalContent.js
+++ b/frontend/src/Settings/Indexers/Indexers/AddIndexerModalContent.js
@@ -13,6 +13,19 @@ import translate from 'Utilities/String/translate';
 import AddIndexerItem from './AddIndexerItem';
 import styles from './AddIndexerModalContent.css';
 
+function mapIndexers(indexers, onIndexerSelect) {
+  return indexers.map((indexer) => {
+    return (
+      <AddIndexerItem
+        key={indexer.implementation}
+        implementation={indexer.implementation}
+        {...indexer}
+        onIndexerSelect={onIndexerSelect}
+      />
+    );
+  });
+}
+
 class AddIndexerModalContent extends Component {
 
   //
@@ -25,6 +38,7 @@ class AddIndexerModalContent extends Component {
       schemaError,
       usenetIndexers,
       torrentIndexers,
+      otherIndexers,
       onIndexerSelect,
       onModalClose
     } = this.props;
@@ -64,16 +78,7 @@ class AddIndexerModalContent extends Component {
                 <FieldSet legend={translate('Usenet')}>
                   <div className={styles.indexers}>
                     {
-                      usenetIndexers.map((indexer) => {
-                        return (
-                          <AddIndexerItem
-                            key={indexer.implementation}
-                            implementation={indexer.implementation}
-                            {...indexer}
-                            onIndexerSelect={onIndexerSelect}
-                          />
-                        );
-                      })
+                      mapIndexers(usenetIndexers, onIndexerSelect)
                     }
                   </div>
                 </FieldSet>
@@ -81,19 +86,22 @@ class AddIndexerModalContent extends Component {
                 <FieldSet legend={translate('Torrents')}>
                   <div className={styles.indexers}>
                     {
-                      torrentIndexers.map((indexer) => {
-                        return (
-                          <AddIndexerItem
-                            key={indexer.implementation}
-                            implementation={indexer.implementation}
-                            {...indexer}
-                            onIndexerSelect={onIndexerSelect}
-                          />
-                        );
-                      })
+                      mapIndexers(torrentIndexers, onIndexerSelect)
                     }
                   </div>
                 </FieldSet>
+
+                {
+                  otherIndexers.length ?
+                    <FieldSet legend="Other">
+                      <div className={styles.indexers}>
+                        {
+                          mapIndexers(otherIndexers, onIndexerSelect)
+                        }
+                      </div>
+                    </FieldSet> :
+                    null
+                }
               </div>
           }
         </ModalBody>
@@ -115,6 +123,7 @@ AddIndexerModalContent.propTypes = {
   schemaError: PropTypes.object,
   usenetIndexers: PropTypes.arrayOf(PropTypes.object).isRequired,
   torrentIndexers: PropTypes.arrayOf(PropTypes.object).isRequired,
+  otherIndexers: PropTypes.arrayOf(PropTypes.object).isRequired,
   onIndexerSelect: PropTypes.func.isRequired,
   onModalClose: PropTypes.func.isRequired
 };
diff --git a/frontend/src/Settings/Indexers/Indexers/AddIndexerModalContentConnector.js b/frontend/src/Settings/Indexers/Indexers/AddIndexerModalContentConnector.js
index a9c313479..b75dc8e6d 100644
--- a/frontend/src/Settings/Indexers/Indexers/AddIndexerModalContentConnector.js
+++ b/frontend/src/Settings/Indexers/Indexers/AddIndexerModalContentConnector.js
@@ -17,15 +17,18 @@ function createMapStateToProps() {
         schema
       } = indexers;
 
-      const usenetIndexers = _.filter(schema, { protocol: 'usenet' });
-      const torrentIndexers = _.filter(schema, { protocol: 'torrent' });
+      const usenetIndexers = _.filter(schema, { protocol: 'UsenetDownloadProtocol' });
+      const torrentIndexers = _.filter(schema, { protocol: 'TorrentDownloadProtocol' });
+      const otherIndexers = _.filter(schema, (x) => x.protocol !== 'UsenetDownloadProtocol' &&
+          x.protocol !== 'TorrentDownloadProtocol');
 
       return {
         isSchemaFetching,
         isSchemaPopulated,
         schemaError,
         usenetIndexers,
-        torrentIndexers
+        torrentIndexers,
+        otherIndexers
       };
     }
   );
diff --git a/frontend/src/Settings/Profiles/Delay/DelayProfile.css b/frontend/src/Settings/Profiles/Delay/DelayProfile.css
index e2d6cd199..8777d0d5f 100644
--- a/frontend/src/Settings/Profiles/Delay/DelayProfile.css
+++ b/frontend/src/Settings/Profiles/Delay/DelayProfile.css
@@ -7,10 +7,14 @@
   line-height: 30px;
 }
 
-.column {
+.name {
   flex: 0 0 200px;
 }
 
+.fillcolumn {
+  flex: 1 0 0;
+}
+
 .actions {
   display: flex;
 }
diff --git a/frontend/src/Settings/Profiles/Delay/DelayProfile.css.d.ts b/frontend/src/Settings/Profiles/Delay/DelayProfile.css.d.ts
index 4ec05c2d6..02a8d0973 100644
--- a/frontend/src/Settings/Profiles/Delay/DelayProfile.css.d.ts
+++ b/frontend/src/Settings/Profiles/Delay/DelayProfile.css.d.ts
@@ -2,12 +2,13 @@
 // Please do not change this file!
 interface CssExports {
   'actions': string;
-  'column': string;
   'delayProfile': string;
   'dragHandle': string;
   'dragIcon': string;
   'editButton': string;
+  'fillcolumn': string;
   'isDragging': string;
+  'name': string;
 }
 export const cssExports: CssExports;
 export default cssExports;
diff --git a/frontend/src/Settings/Profiles/Delay/DelayProfile.js b/frontend/src/Settings/Profiles/Delay/DelayProfile.js
index ab646dd91..15758b4b6 100644
--- a/frontend/src/Settings/Profiles/Delay/DelayProfile.js
+++ b/frontend/src/Settings/Profiles/Delay/DelayProfile.js
@@ -6,28 +6,11 @@ import Link from 'Components/Link/Link';
 import ConfirmModal from 'Components/Modal/ConfirmModal';
 import TagList from 'Components/TagList';
 import { icons, kinds } from 'Helpers/Props';
-import titleCase from 'Utilities/String/titleCase';
 import translate from 'Utilities/String/translate';
+import DelayProfileItem from './DelayProfileItem';
 import EditDelayProfileModalConnector from './EditDelayProfileModalConnector';
 import styles from './DelayProfile.css';
 
-function getDelay(enabled, delay) {
-  if (!enabled) {
-    return '-';
-  }
-
-  if (!delay) {
-    return 'No Delay';
-  }
-
-  if (delay === 1) {
-    return '1 Minute';
-  }
-
-  // TODO: use better units of time than just minutes
-  return `${delay} Minutes`;
-}
-
 class DelayProfile extends Component {
 
   //
@@ -74,25 +57,14 @@ class DelayProfile extends Component {
   render() {
     const {
       id,
-      enableUsenet,
-      enableTorrent,
-      preferredProtocol,
-      usenetDelay,
-      torrentDelay,
+      name,
+      items,
       tags,
       tagList,
       isDragging,
       connectDragSource
     } = this.props;
 
-    let preferred = titleCase(translate('PreferProtocol', { preferredProtocol }));
-
-    if (!enableUsenet) {
-      preferred = translate('OnlyTorrent');
-    } else if (!enableTorrent) {
-      preferred = translate('OnlyUsenet');
-    }
-
     return (
       <div
         className={classNames(
@@ -100,11 +72,26 @@ class DelayProfile extends Component {
           isDragging && styles.isDragging
         )}
       >
-        <div className={styles.column}>{preferred}</div>
-        <div className={styles.column}>{getDelay(enableUsenet, usenetDelay)}</div>
-        <div className={styles.column}>{getDelay(enableTorrent, torrentDelay)}</div>
+
+        <div className={styles.name}>{name}</div>
+
+        <div className={styles.fillcolumn}>
+          {
+            items.map((x) => {
+              return (
+                <DelayProfileItem
+                  key={x.protocol}
+                  name={x.name}
+                  allowed={x.allowed}
+                  delay={x.delay}
+                />
+              );
+            })
+          }
+        </div>
 
         <TagList
+          className={styles.fillcolumn}
           tags={tags}
           tagList={tagList}
         />
@@ -153,11 +140,8 @@ class DelayProfile extends Component {
 
 DelayProfile.propTypes = {
   id: PropTypes.number.isRequired,
-  enableUsenet: PropTypes.bool.isRequired,
-  enableTorrent: PropTypes.bool.isRequired,
-  preferredProtocol: PropTypes.string.isRequired,
-  usenetDelay: PropTypes.number.isRequired,
-  torrentDelay: PropTypes.number.isRequired,
+  name: PropTypes.string.isRequired,
+  items: PropTypes.arrayOf(PropTypes.object).isRequired,
   tags: PropTypes.arrayOf(PropTypes.number).isRequired,
   tagList: PropTypes.arrayOf(PropTypes.object).isRequired,
   isDragging: PropTypes.bool.isRequired,
diff --git a/frontend/src/Settings/Profiles/Delay/DelayProfileItem.js b/frontend/src/Settings/Profiles/Delay/DelayProfileItem.js
new file mode 100644
index 000000000..5df988b2c
--- /dev/null
+++ b/frontend/src/Settings/Profiles/Delay/DelayProfileItem.js
@@ -0,0 +1,43 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import Label from 'Components/Label';
+import { kinds } from 'Helpers/Props';
+
+function getDelay(item) {
+  if (!item.allowed) {
+    return '-';
+  }
+
+  if (!item.delay) {
+    return 'No Delay';
+  }
+
+  if (item.delay === 1) {
+    return '1 Minute';
+  }
+
+  // TODO: use better units of time than just minutes
+  return `${item.delay} Minutes`;
+}
+
+function DelayProfileItem(props) {
+  const {
+    name,
+    allowed
+  } = props;
+
+  return (
+    <Label
+      kind={allowed ? kinds.INFO : kinds.DANGER}
+    >
+      {name}: {getDelay(props)}
+    </Label>
+  );
+}
+
+DelayProfileItem.propTypes = {
+  name: PropTypes.string.isRequired,
+  allowed: PropTypes.bool.isRequired
+};
+
+export default DelayProfileItem;
diff --git a/frontend/src/Settings/Profiles/Delay/DelayProfiles.css b/frontend/src/Settings/Profiles/Delay/DelayProfiles.css
index efc0b14fa..3b10c61c8 100644
--- a/frontend/src/Settings/Profiles/Delay/DelayProfiles.css
+++ b/frontend/src/Settings/Profiles/Delay/DelayProfiles.css
@@ -12,14 +12,18 @@
   font-weight: bold;
 }
 
-.column {
+.name {
   flex: 0 0 200px;
 }
 
-.tags {
+.fillcolumn {
   flex: 1 0 auto;
 }
 
+.actions {
+  flex: 0 0 80px;
+}
+
 .addDelayProfile {
   display: flex;
   justify-content: flex-end;
diff --git a/frontend/src/Settings/Profiles/Delay/DelayProfiles.css.d.ts b/frontend/src/Settings/Profiles/Delay/DelayProfiles.css.d.ts
index 3b7f0ee69..1e45cb9a7 100644
--- a/frontend/src/Settings/Profiles/Delay/DelayProfiles.css.d.ts
+++ b/frontend/src/Settings/Profiles/Delay/DelayProfiles.css.d.ts
@@ -1,13 +1,14 @@
 // This file is automatically generated.
 // Please do not change this file!
 interface CssExports {
+  'actions': string;
   'addButton': string;
   'addDelayProfile': string;
-  'column': string;
   'delayProfiles': string;
   'delayProfilesHeader': string;
+  'fillcolumn': string;
   'horizontalScroll': string;
-  'tags': string;
+  'name': string;
 }
 export const cssExports: CssExports;
 export default cssExports;
diff --git a/frontend/src/Settings/Profiles/Delay/DelayProfiles.js b/frontend/src/Settings/Profiles/Delay/DelayProfiles.js
index 83ac09bf8..460e51f75 100644
--- a/frontend/src/Settings/Profiles/Delay/DelayProfiles.js
+++ b/frontend/src/Settings/Profiles/Delay/DelayProfiles.js
@@ -82,18 +82,10 @@ class DelayProfiles extends Component {
             >
               <div>
                 <div className={styles.delayProfilesHeader}>
-                  <div className={styles.column}>
-                    {translate('PreferredProtocol')}
-                  </div>
-                  <div className={styles.column}>
-                    {translate('UsenetDelay')}
-                  </div>
-                  <div className={styles.column}>
-                    {translate('TorrentDelay')}
-                  </div>
-                  <div className={styles.tags}>
-                    {translate('Tags')}
-                  </div>
+                  <div className={styles.name}>{translate('Name')}</div>
+                  <div className={styles.fillcolumn}>{translate('Protocols')}</div>
+                  <div className={styles.fillcolumn}>{translate('Tags')}</div>
+                  <div className={styles.actions} />
                 </div>
 
                 <div className={styles.delayProfiles}>
diff --git a/frontend/src/Settings/Profiles/Delay/DownloadProtocolItem.css b/frontend/src/Settings/Profiles/Delay/DownloadProtocolItem.css
new file mode 100644
index 000000000..f0de9d6af
--- /dev/null
+++ b/frontend/src/Settings/Profiles/Delay/DownloadProtocolItem.css
@@ -0,0 +1,82 @@
+.qualityProfileItem {
+  display: flex;
+  align-items: stretch;
+  width: 100%;
+  border: 1px solid #aaa;
+  border-radius: 4px;
+  background: #fafafa;
+
+  &.isInGroup {
+    border-style: dashed;
+  }
+}
+
+.checkInputContainer {
+  position: relative;
+  margin-right: 4px;
+  margin-bottom: 5px;
+  margin-left: 8px;
+}
+
+.checkInput {
+  composes: input from '~Components/Form/CheckInput.css';
+
+  margin-top: 5px;
+}
+
+.delayContainer {
+  display: flex;
+  flex-grow: 0;
+}
+
+.delayInput {
+  composes: input from '~Components/Form/Input.css';
+
+  width: 150px;
+  height: 30px;
+  border: unset;
+  border-radius: unset;
+  background-color: unset;
+  box-shadow: unset;
+}
+
+.qualityNameContainer {
+  display: flex;
+  flex-grow: 1;
+  margin-bottom: 0;
+  margin-left: 2px;
+  font-weight: normal;
+  line-height: $qualityProfileItemHeight;
+  cursor: pointer;
+}
+
+.qualityName {
+  &.notAllowed {
+    color: #c6c6c6;
+  }
+}
+
+.dragHandle {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-shrink: 0;
+  margin-left: auto;
+  width: $dragHandleWidth;
+  text-align: center;
+  cursor: grab;
+}
+
+.dragIcon {
+  top: 0;
+}
+
+.isDragging {
+  opacity: 0.25;
+}
+
+.isPreview {
+  .qualityName {
+    margin-left: 14px;
+  }
+}
diff --git a/frontend/src/Settings/Profiles/Delay/DownloadProtocolItem.css.d.ts b/frontend/src/Settings/Profiles/Delay/DownloadProtocolItem.css.d.ts
new file mode 100644
index 000000000..ff6e4ad9e
--- /dev/null
+++ b/frontend/src/Settings/Profiles/Delay/DownloadProtocolItem.css.d.ts
@@ -0,0 +1,19 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  'checkInput': string;
+  'checkInputContainer': string;
+  'delayContainer': string;
+  'delayInput': string;
+  'dragHandle': string;
+  'dragIcon': string;
+  'isDragging': string;
+  'isInGroup': string;
+  'isPreview': string;
+  'notAllowed': string;
+  'qualityName': string;
+  'qualityNameContainer': string;
+  'qualityProfileItem': string;
+}
+export const cssExports: CssExports;
+export default cssExports;
diff --git a/frontend/src/Settings/Profiles/Delay/DownloadProtocolItem.js b/frontend/src/Settings/Profiles/Delay/DownloadProtocolItem.js
new file mode 100644
index 000000000..68c84f752
--- /dev/null
+++ b/frontend/src/Settings/Profiles/Delay/DownloadProtocolItem.js
@@ -0,0 +1,113 @@
+import classNames from 'classnames';
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import CheckInput from 'Components/Form/CheckInput';
+import NumberInput from 'Components/Form/NumberInput';
+import Icon from 'Components/Icon';
+import { icons } from 'Helpers/Props';
+import styles from './DownloadProtocolItem.css';
+
+class DownloadProtocolItem extends Component {
+
+  //
+  // Listeners
+
+  onChange = ({ name, value }) => {
+    const {
+      protocol,
+      onDownloadProtocolItemFieldChange
+    } = this.props;
+
+    onDownloadProtocolItemFieldChange(protocol, name, value);
+  };
+
+  //
+  // Render
+
+  render() {
+    const {
+      isPreview,
+      name,
+      allowed,
+      delay,
+      isDragging,
+      isOverCurrent,
+      connectDragSource
+    } = this.props;
+
+    return (
+      <div
+        className={classNames(
+          styles.qualityProfileItem,
+          isDragging && styles.isDragging,
+          isPreview && styles.isPreview,
+          isOverCurrent && styles.isOverCurrent
+        )}
+      >
+        <label
+          className={styles.qualityNameContainer}
+        >
+
+          <CheckInput
+            className={styles.checkInput}
+            containerClassName={styles.checkInputContainer}
+            name={'allowed'}
+            value={allowed}
+            onChange={this.onChange}
+          />
+
+          <div className={classNames(
+            styles.qualityName,
+            !allowed && styles.notAllowed
+          )}
+          >
+            {name}
+          </div>
+        </label>
+
+        <NumberInput
+          containerClassName={styles.delayContainer}
+          className={styles.delayInput}
+          name={'delay'}
+          value={delay}
+          min={0}
+          max={9999999}
+          onChange={this.onChange}
+        />
+
+        {
+          connectDragSource(
+            <div className={styles.dragHandle}>
+              <Icon
+                className={styles.dragIcon}
+                title="Create group"
+                name={icons.REORDER}
+              />
+            </div>
+          )
+        }
+      </div>
+    );
+  }
+}
+
+DownloadProtocolItem.propTypes = {
+  isPreview: PropTypes.bool,
+  protocol: PropTypes.string.isRequired,
+  name: PropTypes.string.isRequired,
+  allowed: PropTypes.bool.isRequired,
+  delay: PropTypes.number.isRequired,
+  isDragging: PropTypes.bool.isRequired,
+  isOverCurrent: PropTypes.bool.isRequired,
+  connectDragSource: PropTypes.func,
+  onDownloadProtocolItemFieldChange: PropTypes.func
+};
+
+DownloadProtocolItem.defaultProps = {
+  isPreview: false,
+  isOverCurrent: false,
+  // The drag preview will not connect the drag handle.
+  connectDragSource: (node) => node
+};
+
+export default DownloadProtocolItem;
diff --git a/frontend/src/Settings/Profiles/Delay/DownloadProtocolItemDragPreview.css b/frontend/src/Settings/Profiles/Delay/DownloadProtocolItemDragPreview.css
new file mode 100644
index 000000000..afe4c76ca
--- /dev/null
+++ b/frontend/src/Settings/Profiles/Delay/DownloadProtocolItemDragPreview.css
@@ -0,0 +1,4 @@
+.dragPreview {
+  width: 480px;
+  opacity: 0.75;
+}
diff --git a/frontend/src/Settings/Profiles/Delay/DownloadProtocolItemDragPreview.css.d.ts b/frontend/src/Settings/Profiles/Delay/DownloadProtocolItemDragPreview.css.d.ts
new file mode 100644
index 000000000..1f1f3c320
--- /dev/null
+++ b/frontend/src/Settings/Profiles/Delay/DownloadProtocolItemDragPreview.css.d.ts
@@ -0,0 +1,7 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  'dragPreview': string;
+}
+export const cssExports: CssExports;
+export default cssExports;
diff --git a/frontend/src/Settings/Profiles/Delay/DownloadProtocolItemDragPreview.js b/frontend/src/Settings/Profiles/Delay/DownloadProtocolItemDragPreview.js
new file mode 100644
index 000000000..8cb5ca023
--- /dev/null
+++ b/frontend/src/Settings/Profiles/Delay/DownloadProtocolItemDragPreview.js
@@ -0,0 +1,89 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { DragLayer } from 'react-dnd';
+import DragPreviewLayer from 'Components/DragPreviewLayer';
+import { DOWNLOAD_PROTOCOL_ITEM } from 'Helpers/dragTypes';
+import dimensions from 'Styles/Variables/dimensions.js';
+import DownloadProtocolItem from './DownloadProtocolItem';
+import styles from './DownloadProtocolItemDragPreview.css';
+
+const formGroupSmallWidth = parseInt(dimensions.formGroupSmallWidth);
+const formLabelSmallWidth = parseInt(dimensions.formLabelSmallWidth);
+const formLabelRightMarginWidth = parseInt(dimensions.formLabelRightMarginWidth);
+const dragHandleWidth = parseInt(dimensions.dragHandleWidth);
+
+function collectDragLayer(monitor) {
+  return {
+    item: monitor.getItem(),
+    itemType: monitor.getItemType(),
+    currentOffset: monitor.getSourceClientOffset()
+  };
+}
+
+class DownloadProtocolItemDragPreview extends Component {
+
+  //
+  // Render
+
+  render() {
+    const {
+      item,
+      itemType,
+      currentOffset
+    } = this.props;
+
+    if (!currentOffset || itemType !== DOWNLOAD_PROTOCOL_ITEM) {
+      return null;
+    }
+
+    // The offset is shifted because the drag handle is on the right edge of the
+    // list item and the preview is wider than the drag handle.
+
+    const { x, y } = currentOffset;
+    const handleOffset = formGroupSmallWidth - formLabelSmallWidth - formLabelRightMarginWidth - dragHandleWidth;
+    const transform = `translate3d(${x - handleOffset}px, ${y}px, 0)`;
+
+    const style = {
+      position: 'absolute',
+      WebkitTransform: transform,
+      msTransform: transform,
+      transform
+    };
+
+    const {
+      id,
+      name,
+      allowed,
+      delay
+    } = item;
+
+    return (
+      <DragPreviewLayer>
+        <div
+          className={styles.dragPreview}
+          style={style}
+        >
+          <DownloadProtocolItem
+            isPreview={true}
+            id={id}
+            name={name}
+            allowed={allowed}
+            delay={delay}
+            isDragging={false}
+          />
+        </div>
+      </DragPreviewLayer>
+    );
+  }
+}
+
+DownloadProtocolItemDragPreview.propTypes = {
+  item: PropTypes.object,
+  itemType: PropTypes.string,
+  currentOffset: PropTypes.shape({
+    x: PropTypes.number.isRequired,
+    y: PropTypes.number.isRequired
+  })
+};
+
+export default DragLayer(collectDragLayer)(DownloadProtocolItemDragPreview);
diff --git a/frontend/src/Settings/Profiles/Delay/DownloadProtocolItemDragSource.css b/frontend/src/Settings/Profiles/Delay/DownloadProtocolItemDragSource.css
new file mode 100644
index 000000000..0d960aed9
--- /dev/null
+++ b/frontend/src/Settings/Profiles/Delay/DownloadProtocolItemDragSource.css
@@ -0,0 +1,18 @@
+.downloadProtocolItemDragSource {
+  padding: $qualityProfileItemDragSourcePadding 0;
+}
+
+.downloadProtocolItemPlaceholder {
+  width: 100%;
+  height: $qualityProfileItemHeight;
+  border: 1px dotted #aaa;
+  border-radius: 4px;
+}
+
+.downloadProtocolItemPlaceholderBefore {
+  margin-bottom: 8px;
+}
+
+.downloadProtocolItemPlaceholderAfter {
+  margin-top: 8px;
+}
diff --git a/frontend/src/Settings/Profiles/Delay/DownloadProtocolItemDragSource.css.d.ts b/frontend/src/Settings/Profiles/Delay/DownloadProtocolItemDragSource.css.d.ts
new file mode 100644
index 000000000..5c9e71eb8
--- /dev/null
+++ b/frontend/src/Settings/Profiles/Delay/DownloadProtocolItemDragSource.css.d.ts
@@ -0,0 +1,10 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  'downloadProtocolItemDragSource': string;
+  'downloadProtocolItemPlaceholder': string;
+  'downloadProtocolItemPlaceholderAfter': string;
+  'downloadProtocolItemPlaceholderBefore': string;
+}
+export const cssExports: CssExports;
+export default cssExports;
diff --git a/frontend/src/Settings/Profiles/Delay/DownloadProtocolItemDragSource.js b/frontend/src/Settings/Profiles/Delay/DownloadProtocolItemDragSource.js
new file mode 100644
index 000000000..cb63c6e9b
--- /dev/null
+++ b/frontend/src/Settings/Profiles/Delay/DownloadProtocolItemDragSource.js
@@ -0,0 +1,188 @@
+import classNames from 'classnames';
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { DragSource, DropTarget } from 'react-dnd';
+import { findDOMNode } from 'react-dom';
+import { DOWNLOAD_PROTOCOL_ITEM } from 'Helpers/dragTypes';
+import DownloadProtocolItem from './DownloadProtocolItem';
+import styles from './DownloadProtocolItemDragSource.css';
+
+const downloadProtocolItemDragSource = {
+  beginDrag(props) {
+    const {
+      index,
+      protocol,
+      name,
+      allowed,
+      delay
+    } = props;
+
+    return {
+      index,
+      protocol,
+      name,
+      allowed,
+      delay
+    };
+  },
+
+  endDrag(props, monitor, component) {
+    props.onDownloadProtocolItemDragEnd(monitor.didDrop());
+  }
+};
+
+const downloadProtocolItemDropTarget = {
+  hover(props, monitor, component) {
+    const {
+      index: dragIndex
+    } = monitor.getItem();
+
+    const dropIndex = props.index;
+
+    // Use childNodeIndex to select the correct node to get the middle of so
+    // we don't bounce between above and below causing rapid setState calls.
+    const childNodeIndex = component.props.isOverCurrent && component.props.isDraggingUp ? 1 :0;
+    const componentDOMNode = findDOMNode(component).children[childNodeIndex];
+    const hoverBoundingRect = componentDOMNode.getBoundingClientRect();
+    const hoverMiddleY = (hoverBoundingRect.bottom - hoverBoundingRect.top) / 2;
+    const clientOffset = monitor.getClientOffset();
+    const hoverClientY = clientOffset.y - hoverBoundingRect.top;
+
+    // If we're hovering over a child don't trigger on the parent
+    if (!monitor.isOver({ shallow: true })) {
+      return;
+    }
+
+    // Don't show targets for dropping on self
+    if (dragIndex === dropIndex) {
+      return;
+    }
+
+    let dropPosition = null;
+
+    // Determine drop position based on position over target
+    if (hoverClientY > hoverMiddleY) {
+      dropPosition = 'below';
+    } else if (hoverClientY < hoverMiddleY) {
+      dropPosition = 'above';
+    } else {
+      return;
+    }
+
+    props.onDownloadProtocolItemDragMove({
+      dragIndex,
+      dropIndex,
+      dropPosition
+    });
+  }
+};
+
+function collectDragSource(connect, monitor) {
+  return {
+    connectDragSource: connect.dragSource(),
+    isDragging: monitor.isDragging()
+  };
+}
+
+function collectDropTarget(connect, monitor) {
+  return {
+    connectDropTarget: connect.dropTarget(),
+    isOver: monitor.isOver(),
+    isOverCurrent: monitor.isOver({ shallow: true })
+  };
+}
+
+class DownloadProtocolItemDragSource extends Component {
+
+  //
+  // Render
+
+  render() {
+    const {
+      protocol,
+      name,
+      allowed,
+      delay,
+      index,
+      isDragging,
+      isDraggingUp,
+      isDraggingDown,
+      isOverCurrent,
+      connectDragSource,
+      connectDropTarget,
+      onDownloadProtocolItemFieldChange
+    } = this.props;
+
+    const isBefore = !isDragging && isDraggingUp && isOverCurrent;
+    const isAfter = !isDragging && isDraggingDown && isOverCurrent;
+
+    return connectDropTarget(
+      <div
+        className={classNames(
+          styles.downloadProtocolItemDragSource,
+          isBefore && styles.isDraggingUp,
+          isAfter && styles.isDraggingDown
+        )}
+      >
+        {
+          isBefore &&
+            <div
+              className={classNames(
+                styles.downloadProtocolItemPlaceholder,
+                styles.downloadProtocolItemPlaceholderBefore
+              )}
+            />
+        }
+
+        <DownloadProtocolItem
+          protocol={protocol}
+          name={name}
+          allowed={allowed}
+          delay={delay}
+          index={index}
+          isDragging={isDragging}
+          isOverCurrent={isOverCurrent}
+          connectDragSource={connectDragSource}
+          onDownloadProtocolItemFieldChange={onDownloadProtocolItemFieldChange}
+        />
+
+        {
+          isAfter &&
+            <div
+              className={classNames(
+                styles.downloadProtocolItemPlaceholder,
+                styles.downloadProtocolItemPlaceholderAfter
+              )}
+            />
+        }
+      </div>
+    );
+  }
+}
+
+DownloadProtocolItemDragSource.propTypes = {
+  protocol: PropTypes.string.isRequired,
+  name: PropTypes.string.isRequired,
+  allowed: PropTypes.bool.isRequired,
+  delay: PropTypes.number.isRequired,
+  index: PropTypes.number.isRequired,
+  isDragging: PropTypes.bool,
+  isDraggingUp: PropTypes.bool,
+  isDraggingDown: PropTypes.bool,
+  isOverCurrent: PropTypes.bool,
+  connectDragSource: PropTypes.func,
+  connectDropTarget: PropTypes.func,
+  onDownloadProtocolItemFieldChange: PropTypes.func.isRequired,
+  onDownloadProtocolItemDragMove: PropTypes.func.isRequired,
+  onDownloadProtocolItemDragEnd: PropTypes.func.isRequired
+};
+
+export default DropTarget(
+  DOWNLOAD_PROTOCOL_ITEM,
+  downloadProtocolItemDropTarget,
+  collectDropTarget
+)(DragSource(
+  DOWNLOAD_PROTOCOL_ITEM,
+  downloadProtocolItemDragSource,
+  collectDragSource
+)(DownloadProtocolItemDragSource));
diff --git a/frontend/src/Settings/Profiles/Delay/DownloadProtocolItems.css b/frontend/src/Settings/Profiles/Delay/DownloadProtocolItems.css
new file mode 100644
index 000000000..e186bec50
--- /dev/null
+++ b/frontend/src/Settings/Profiles/Delay/DownloadProtocolItems.css
@@ -0,0 +1,24 @@
+.qualities {
+  margin-top: 10px;
+  transition: min-height 200ms;
+  user-select: none;
+}
+
+.headerContainer {
+  display: flex;
+  font-weight: bold;
+  line-height: 35px;
+}
+
+.headerTitle {
+  display: flex;
+  flex-grow: 1;
+}
+
+.headerDelay {
+  display: flex;
+  flex-grow: 0;
+  margin-right: 40px;
+  padding-left: 16px;
+  width: 150px;
+}
diff --git a/frontend/src/Settings/Profiles/Delay/DownloadProtocolItems.css.d.ts b/frontend/src/Settings/Profiles/Delay/DownloadProtocolItems.css.d.ts
new file mode 100644
index 000000000..9e0963ed9
--- /dev/null
+++ b/frontend/src/Settings/Profiles/Delay/DownloadProtocolItems.css.d.ts
@@ -0,0 +1,10 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  'headerContainer': string;
+  'headerDelay': string;
+  'headerTitle': string;
+  'qualities': string;
+}
+export const cssExports: CssExports;
+export default cssExports;
diff --git a/frontend/src/Settings/Profiles/Delay/DownloadProtocolItems.js b/frontend/src/Settings/Profiles/Delay/DownloadProtocolItems.js
new file mode 100644
index 000000000..90d379f07
--- /dev/null
+++ b/frontend/src/Settings/Profiles/Delay/DownloadProtocolItems.js
@@ -0,0 +1,150 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import FormGroup from 'Components/Form/FormGroup';
+import FormInputHelpText from 'Components/Form/FormInputHelpText';
+import FormLabel from 'Components/Form/FormLabel';
+import Measure from 'Components/Measure';
+import { sizes } from 'Helpers/Props';
+import DownloadProtocolItemDragPreview from './DownloadProtocolItemDragPreview';
+import DownloadProtocolItemDragSource from './DownloadProtocolItemDragSource';
+import styles from './DownloadProtocolItems.css';
+
+class DownloadProtocolItems extends Component {
+
+  //
+  // Lifecycle
+
+  constructor(props, context) {
+    super(props, context);
+
+    this.state = {
+      height: 0
+    };
+  }
+
+  //
+  // Listeners
+
+  onMeasure = ({ height }) => {
+    this.setState({ height });
+  };
+
+  //
+  // Render
+
+  render() {
+    const {
+      dropIndex,
+      dropPosition,
+      items,
+      errors,
+      warnings,
+      ...otherProps
+    } = this.props;
+
+    const {
+      height
+    } = this.state;
+
+    const isDragging = dropIndex !== null;
+    const isDraggingUp = isDragging && dropPosition === 'above';
+    const isDraggingDown = isDragging && dropPosition === 'below';
+
+    return (
+      <FormGroup size={sizes.SMALL}>
+        <FormLabel size={sizes.SMALL}>
+          Download Protocols
+        </FormLabel>
+
+        <div>
+          <FormInputHelpText
+            text="Protocols higher in the list are more preferred. Only checked protocols are allowed"
+          />
+
+          {
+            errors.map((error, index) => {
+              return (
+                <FormInputHelpText
+                  key={index}
+                  text={error.message}
+                  isError={true}
+                  isCheckInput={false}
+                />
+              );
+            })
+          }
+
+          {
+            warnings.map((warning, index) => {
+              return (
+                <FormInputHelpText
+                  key={index}
+                  text={warning.message}
+                  isWarning={true}
+                  isCheckInput={false}
+                />
+              );
+            })
+          }
+
+          <Measure
+            whitelist={['height']}
+            includeMargin={false}
+            onMeasure={this.onMeasure}
+          >
+            <div
+              className={styles.qualities}
+              style={{ minHeight: `${height}px` }}
+            >
+              <div className={styles.headerContainer}>
+                <div className={styles.headerTitle}>
+                  Protocol
+                </div>
+                <div className={styles.headerDelay}>
+                  Delay (minutes)
+                </div>
+              </div>
+
+              {
+                items.map(({ protocol, name, allowed, delay }, index) => {
+                  return (
+                    <DownloadProtocolItemDragSource
+                      key={protocol}
+                      protocol={protocol}
+                      name={name}
+                      allowed={allowed}
+                      delay={delay}
+                      index={index}
+                      isDragging={isDragging}
+                      isDraggingUp={isDraggingUp}
+                      isDraggingDown={isDraggingDown}
+                      {...otherProps}
+                    />
+                  );
+                })
+              }
+
+              <DownloadProtocolItemDragPreview />
+            </div>
+          </Measure>
+        </div>
+      </FormGroup>
+    );
+  }
+}
+
+DownloadProtocolItems.propTypes = {
+  dragIndex: PropTypes.number,
+  dropIndex: PropTypes.number,
+  dropPosition: PropTypes.string,
+  items: PropTypes.arrayOf(PropTypes.object).isRequired,
+  errors: PropTypes.arrayOf(PropTypes.object),
+  warnings: PropTypes.arrayOf(PropTypes.object)
+};
+
+DownloadProtocolItems.defaultProps = {
+  errors: [],
+  warnings: []
+};
+
+export default DownloadProtocolItems;
diff --git a/frontend/src/Settings/Profiles/Delay/EditDelayProfileModalContent.js b/frontend/src/Settings/Profiles/Delay/EditDelayProfileModalContent.js
index da1bf7f44..6fd0125c8 100644
--- a/frontend/src/Settings/Profiles/Delay/EditDelayProfileModalContent.js
+++ b/frontend/src/Settings/Profiles/Delay/EditDelayProfileModalContent.js
@@ -12,49 +12,22 @@ import ModalBody from 'Components/Modal/ModalBody';
 import ModalContent from 'Components/Modal/ModalContent';
 import ModalFooter from 'Components/Modal/ModalFooter';
 import ModalHeader from 'Components/Modal/ModalHeader';
-import { inputTypes, kinds } from 'Helpers/Props';
-import { boolSettingShape, numberSettingShape, tagSettingShape } from 'Helpers/Props/Shapes/settingShape';
+import { inputTypes, kinds, sizes } from 'Helpers/Props';
+import { boolSettingShape, numberSettingShape, stringSettingShape, tagSettingShape } from 'Helpers/Props/Shapes/settingShape';
 import translate from 'Utilities/String/translate';
+import DownloadProtocolItems from './DownloadProtocolItems';
 import styles from './EditDelayProfileModalContent.css';
 
-const protocolOptions = [
-  {
-    key: 'preferUsenet',
-    get value() {
-      return translate('PreferUsenet');
-    }
-  },
-  {
-    key: 'preferTorrent',
-    get value() {
-      return translate('PreferTorrent');
-    }
-  },
-  {
-    key: 'onlyUsenet',
-    get value() {
-      return translate('OnlyUsenet');
-    }
-  },
-  {
-    key: 'onlyTorrent',
-    get value() {
-      return translate('OnlyTorrent');
-    }
-  }
-];
-
 function EditDelayProfileModalContent(props) {
   const {
     id,
     isFetching,
+    isPopulated,
     error,
     isSaving,
     saveError,
     item,
-    protocol,
     onInputChange,
-    onProtocolChange,
     onSavePress,
     onModalClose,
     onDeleteDelayProfilePress,
@@ -62,10 +35,8 @@ function EditDelayProfileModalContent(props) {
   } = props;
 
   const {
-    enableUsenet,
-    enableTorrent,
-    usenetDelay,
-    torrentDelay,
+    name,
+    items,
     bypassIfHighestQuality,
     bypassIfAboveCustomFormatScore,
     minimumCustomFormatScore,
@@ -88,60 +59,35 @@ function EditDelayProfileModalContent(props) {
         {
           !isFetching && !!error ?
             <div>
-              {translate('UnableToAddANewQualityProfilePleaseTryAgain')}
+              {translate('UnableToAddANewDelayProfilePleaseTryAgain')}
             </div> :
             null
         }
 
         {
-          !isFetching && !error ?
+          !isFetching && isPopulated && !error ?
             <Form {...otherProps}>
-              <FormGroup>
-                <FormLabel>{translate('PreferredProtocol')}</FormLabel>
+              <FormGroup size={sizes.SMALL}>
+                <FormLabel size={sizes.SMALL}>
+                  {translate('Name')}
+                </FormLabel>
 
                 <FormInputGroup
-                  type={inputTypes.SELECT}
-                  name="protocol"
-                  value={protocol}
-                  values={protocolOptions}
-                  helpText={translate('ProtocolHelpText')}
-                  onChange={onProtocolChange}
+                  type={inputTypes.TEXT}
+                  name="name"
+                  {...name}
+                  onChange={onInputChange}
                 />
               </FormGroup>
 
-              {
-                enableUsenet.value ?
-                  <FormGroup>
-                    <FormLabel>{translate('UsenetDelay')}</FormLabel>
-
-                    <FormInputGroup
-                      type={inputTypes.NUMBER}
-                      name="usenetDelay"
-                      unit="minutes"
-                      {...usenetDelay}
-                      helpText={translate('UsenetDelayHelpText')}
-                      onChange={onInputChange}
-                    />
-                  </FormGroup> :
-                  null
-              }
-
-              {
-                enableTorrent.value ?
-                  <FormGroup>
-                    <FormLabel>{translate('TorrentDelay')}</FormLabel>
-
-                    <FormInputGroup
-                      type={inputTypes.NUMBER}
-                      name="torrentDelay"
-                      unit="minutes"
-                      {...torrentDelay}
-                      helpText={translate('TorrentDelayHelpText')}
-                      onChange={onInputChange}
-                    />
-                  </FormGroup> :
-                  null
-              }
+              <div className={styles.formGroupWrapper}>
+                <DownloadProtocolItems
+                  items={items.value}
+                  errors={items.errors}
+                  warnings={items.warnings}
+                  {...otherProps}
+                />
+              </div>
 
               <FormGroup>
                 <FormLabel>{translate('BypassIfHighestQuality')}</FormLabel>
@@ -186,11 +132,13 @@ function EditDelayProfileModalContent(props) {
               {
                 id === 1 ?
                   <Alert>
-                    {translate('DefaultDelayProfileHelpText')}
+                    This is the default profile. It applies to all artists that don't have an explicit profile.
                   </Alert> :
 
-                  <FormGroup>
-                    <FormLabel>{translate('Tags')}</FormLabel>
+                  <FormGroup size={sizes.SMALL}>
+                    <FormLabel size={sizes.SMALL}>
+                      {translate('Tags')}
+                    </FormLabel>
 
                     <FormInputGroup
                       type={inputTypes.TAG}
@@ -237,13 +185,11 @@ function EditDelayProfileModalContent(props) {
 }
 
 const delayProfileShape = {
-  enableUsenet: PropTypes.shape(boolSettingShape).isRequired,
-  enableTorrent: PropTypes.shape(boolSettingShape).isRequired,
-  usenetDelay: PropTypes.shape(numberSettingShape).isRequired,
-  torrentDelay: PropTypes.shape(numberSettingShape).isRequired,
   bypassIfHighestQuality: PropTypes.shape(boolSettingShape).isRequired,
   bypassIfAboveCustomFormatScore: PropTypes.shape(boolSettingShape).isRequired,
   minimumCustomFormatScore: PropTypes.shape(numberSettingShape).isRequired,
+  name: PropTypes.shape(stringSettingShape).isRequired,
+  items: PropTypes.object.isRequired,
   order: PropTypes.shape(numberSettingShape),
   tags: PropTypes.shape(tagSettingShape).isRequired
 };
@@ -251,13 +197,12 @@ const delayProfileShape = {
 EditDelayProfileModalContent.propTypes = {
   id: PropTypes.number,
   isFetching: PropTypes.bool.isRequired,
+  isPopulated: PropTypes.bool.isRequired,
   error: PropTypes.object,
   isSaving: PropTypes.bool.isRequired,
   saveError: PropTypes.object,
   item: PropTypes.shape(delayProfileShape).isRequired,
-  protocol: PropTypes.string.isRequired,
   onInputChange: PropTypes.func.isRequired,
-  onProtocolChange: PropTypes.func.isRequired,
   onSavePress: PropTypes.func.isRequired,
   onModalClose: PropTypes.func.isRequired,
   onDeleteDelayProfilePress: PropTypes.func
diff --git a/frontend/src/Settings/Profiles/Delay/EditDelayProfileModalContentConnector.js b/frontend/src/Settings/Profiles/Delay/EditDelayProfileModalContentConnector.js
index a1e3d85a1..a567ac4a5 100644
--- a/frontend/src/Settings/Profiles/Delay/EditDelayProfileModalContentConnector.js
+++ b/frontend/src/Settings/Profiles/Delay/EditDelayProfileModalContentConnector.js
@@ -3,77 +3,15 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { createSelector } from 'reselect';
-import { saveDelayProfile, setDelayProfileValue } from 'Store/Actions/settingsActions';
-import selectSettings from 'Store/Selectors/selectSettings';
+import { fetchDelayProfileSchema, saveDelayProfile, setDelayProfileValue } from 'Store/Actions/settingsActions';
+import createProviderSettingsSelector from 'Store/Selectors/createProviderSettingsSelector';
 import EditDelayProfileModalContent from './EditDelayProfileModalContent';
 
-const newDelayProfile = {
-  enableUsenet: true,
-  enableTorrent: true,
-  preferredProtocol: 'usenet',
-  usenetDelay: 0,
-  torrentDelay: 0,
-  bypassIfHighestQuality: false,
-  bypassIfAboveCustomFormatScore: false,
-  minimumCustomFormatScore: 0,
-  tags: []
-};
-
-function createDelayProfileSelector() {
-  return createSelector(
-    (state, { id }) => id,
-    (state) => state.settings.delayProfiles,
-    (id, delayProfiles) => {
-      const {
-        isFetching,
-        error,
-        isSaving,
-        saveError,
-        pendingChanges,
-        items
-      } = delayProfiles;
-
-      const profile = id ? _.find(items, { id }) : newDelayProfile;
-      const settings = selectSettings(profile, pendingChanges, saveError);
-
-      return {
-        id,
-        isFetching,
-        error,
-        isSaving,
-        saveError,
-        item: settings.settings,
-        ...settings
-      };
-    }
-  );
-}
-
 function createMapStateToProps() {
   return createSelector(
-    createDelayProfileSelector(),
+    createProviderSettingsSelector('delayProfiles'),
     (delayProfile) => {
-      const enableUsenet = delayProfile.item.enableUsenet.value;
-      const enableTorrent = delayProfile.item.enableTorrent.value;
-      const preferredProtocol = delayProfile.item.preferredProtocol.value;
-      let protocol = 'preferUsenet';
-
-      if (preferredProtocol === 'usenet') {
-        protocol = 'preferUsenet';
-      } else {
-        protocol = 'preferTorrent';
-      }
-
-      if (!enableUsenet) {
-        protocol = 'onlyTorrent';
-      }
-
-      if (!enableTorrent) {
-        protocol = 'onlyUsenet';
-      }
-
       return {
-        protocol,
         ...delayProfile
       };
     }
@@ -81,6 +19,7 @@ function createMapStateToProps() {
 }
 
 const mapDispatchToProps = {
+  fetchDelayProfileSchema,
   setDelayProfileValue,
   saveDelayProfile
 };
@@ -90,14 +29,19 @@ class EditDelayProfileModalContentConnector extends Component {
   //
   // Lifecycle
 
+  constructor(props, context) {
+    super(props, context);
+
+    this.state = {
+      dragIndex: null,
+      dropIndex: null,
+      dropPosition: null
+    };
+  }
+
   componentDidMount() {
-    if (!this.props.id) {
-      Object.keys(newDelayProfile).forEach((name) => {
-        this.props.setDelayProfileValue({
-          name,
-          value: newDelayProfile[name]
-        });
-      });
+    if (!this.props.id && !this.props.isPopulated) {
+      this.props.fetchDelayProfileSchema();
     }
   }
 
@@ -114,35 +58,77 @@ class EditDelayProfileModalContentConnector extends Component {
     this.props.setDelayProfileValue({ name, value });
   };
 
-  onProtocolChange = ({ value }) => {
-    switch (value) {
-      case 'preferUsenet':
-        this.props.setDelayProfileValue({ name: 'enableUsenet', value: true });
-        this.props.setDelayProfileValue({ name: 'enableTorrent', value: true });
-        this.props.setDelayProfileValue({ name: 'preferredProtocol', value: 'usenet' });
-        break;
-      case 'preferTorrent':
-        this.props.setDelayProfileValue({ name: 'enableUsenet', value: true });
-        this.props.setDelayProfileValue({ name: 'enableTorrent', value: true });
-        this.props.setDelayProfileValue({ name: 'preferredProtocol', value: 'torrent' });
-        break;
-      case 'onlyUsenet':
-        this.props.setDelayProfileValue({ name: 'enableUsenet', value: true });
-        this.props.setDelayProfileValue({ name: 'enableTorrent', value: false });
-        this.props.setDelayProfileValue({ name: 'preferredProtocol', value: 'usenet' });
-        break;
-      case 'onlyTorrent':
-        this.props.setDelayProfileValue({ name: 'enableUsenet', value: false });
-        this.props.setDelayProfileValue({ name: 'enableTorrent', value: true });
-        this.props.setDelayProfileValue({ name: 'preferredProtocol', value: 'torrent' });
-        break;
-      default:
-        throw Error(`Unknown protocol option: ${value}`);
+  onSavePress = () => {
+    this.props.saveDelayProfile({ id: this.props.id });
+  };
+
+  onDownloadProtocolItemFieldChange = (protocol, name, value) => {
+    const delayProfile = _.cloneDeep(this.props.item);
+    const items = delayProfile.items.value;
+    const item = _.find(delayProfile.items.value, (i) => i.protocol === protocol);
+
+    item[name] = value;
+
+    this.props.setDelayProfileValue({
+      name: 'items',
+      value: items
+    });
+  };
+
+  onDownloadProtocolItemDragMove = ({ dragIndex, dropIndex, dropPosition }) => {
+    if (
+      (dropPosition === 'below' && dropIndex + 1 === dragIndex) ||
+      (dropPosition === 'above' && dropIndex - 1 === dragIndex)
+    ) {
+      if (
+        this.state.dragIndex != null &&
+        this.state.dropIndex != null &&
+        this.state.dropPosition != null
+      ) {
+        this.setState({
+          dragIndex: null,
+          dropIndex: null,
+          dropPosition: null
+        });
+      }
+
+      return;
+    }
+
+    if (this.state.dragIndex !== dragIndex ||
+        this.state.dropIndex !== dropIndex ||
+        this.state.dropPosition !== dropPosition) {
+      this.setState({
+        dragIndex,
+        dropIndex,
+        dropPosition
+      });
     }
   };
 
-  onSavePress = () => {
-    this.props.saveDelayProfile({ id: this.props.id });
+  onDownloadProtocolItemDragEnd = (didDrop) => {
+    const {
+      dragIndex,
+      dropIndex
+    } = this.state;
+
+    if (didDrop && dropIndex !== null) {
+      const delayProfile = _.cloneDeep(this.props.item);
+      const items = delayProfile.items.value;
+      const item = items.splice(dragIndex, 1)[0];
+
+      items.splice(dropIndex, 0, item);
+
+      this.props.setDelayProfileValue({
+        name: 'items',
+        value: items
+      });
+    }
+
+    this.setState({
+      dragIndex: null,
+      dropIndex: null
+    });
   };
 
   //
@@ -151,10 +137,13 @@ class EditDelayProfileModalContentConnector extends Component {
   render() {
     return (
       <EditDelayProfileModalContent
+        {...this.state}
         {...this.props}
         onSavePress={this.onSavePress}
         onInputChange={this.onInputChange}
-        onProtocolChange={this.onProtocolChange}
+        onDownloadProtocolItemFieldChange={this.onDownloadProtocolItemFieldChange}
+        onDownloadProtocolItemDragMove={this.onDownloadProtocolItemDragMove}
+        onDownloadProtocolItemDragEnd={this.onDownloadProtocolItemDragEnd}
       />
     );
   }
@@ -162,9 +151,11 @@ class EditDelayProfileModalContentConnector extends Component {
 
 EditDelayProfileModalContentConnector.propTypes = {
   id: PropTypes.number,
+  isPopulated: PropTypes.bool.isRequired,
   isSaving: PropTypes.bool.isRequired,
   saveError: PropTypes.object,
   item: PropTypes.object.isRequired,
+  fetchDelayProfileSchema: PropTypes.func.isRequired,
   setDelayProfileValue: PropTypes.func.isRequired,
   saveDelayProfile: PropTypes.func.isRequired,
   onModalClose: PropTypes.func.isRequired
diff --git a/frontend/src/Settings/Tags/Details/TagDetailsDelayProfile.css b/frontend/src/Settings/Tags/Details/TagDetailsDelayProfile.css
new file mode 100644
index 000000000..5d3760edd
--- /dev/null
+++ b/frontend/src/Settings/Tags/Details/TagDetailsDelayProfile.css
@@ -0,0 +1,15 @@
+.delayProfile {
+  display: flex;
+  align-items: stretch;
+  margin-bottom: 10px;
+  height: 30px;
+  line-height: 30px;
+}
+
+.name {
+  flex: 0 0 200px;
+}
+
+.tags {
+  flex: 1 0 auto;
+}
diff --git a/frontend/src/Settings/Tags/Details/TagDetailsDelayProfile.css.d.ts b/frontend/src/Settings/Tags/Details/TagDetailsDelayProfile.css.d.ts
new file mode 100644
index 000000000..bc6827059
--- /dev/null
+++ b/frontend/src/Settings/Tags/Details/TagDetailsDelayProfile.css.d.ts
@@ -0,0 +1,9 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  'delayProfile': string;
+  'name': string;
+  'tags': string;
+}
+export const cssExports: CssExports;
+export default cssExports;
diff --git a/frontend/src/Settings/Tags/Details/TagDetailsDelayProfile.js b/frontend/src/Settings/Tags/Details/TagDetailsDelayProfile.js
index ab670359b..eab699efa 100644
--- a/frontend/src/Settings/Tags/Details/TagDetailsDelayProfile.js
+++ b/frontend/src/Settings/Tags/Details/TagDetailsDelayProfile.js
@@ -1,35 +1,41 @@
 import PropTypes from 'prop-types';
 import React from 'react';
-import titleCase from 'Utilities/String/titleCase';
+import DelayProfileItem from 'Settings/Profiles/Delay/DelayProfileItem';
+import styles from './TagDetailsDelayProfile.css';
 
 function TagDetailsDelayProfile(props) {
   const {
-    preferredProtocol,
-    enableUsenet,
-    enableTorrent,
-    usenetDelay,
-    torrentDelay
+    name: profileName,
+    items
   } = props;
 
   return (
-    <div>
-      <div>
-        Protocol: {titleCase(preferredProtocol)}
+    <div
+      className={styles.delayProfile}
+    >
+      <div
+        className={styles.name}
+      >
+        {profileName}
       </div>
 
-      <div>
+      <div className={styles.tags}>
         {
-          enableUsenet ?
-            `Usenet Delay: ${usenetDelay}` :
-            'Usenet disabled'
-        }
-      </div>
+          items.map((item) => {
+            const {
+              protocol,
+              name,
+              allowed
+            } = item;
 
-      <div>
-        {
-          enableTorrent ?
-            `Torrent Delay: ${torrentDelay}` :
-            'Torrents disabled'
+            return (
+              <DelayProfileItem
+                key={protocol}
+                name={name}
+                allowed={allowed}
+              />
+            );
+          })
         }
       </div>
     </div>
@@ -37,11 +43,8 @@ function TagDetailsDelayProfile(props) {
 }
 
 TagDetailsDelayProfile.propTypes = {
-  preferredProtocol: PropTypes.string.isRequired,
-  enableUsenet: PropTypes.bool.isRequired,
-  enableTorrent: PropTypes.bool.isRequired,
-  usenetDelay: PropTypes.number.isRequired,
-  torrentDelay: PropTypes.number.isRequired
+  name: PropTypes.string.isRequired,
+  items: PropTypes.arrayOf(PropTypes.object).isRequired
 };
 
 export default TagDetailsDelayProfile;
diff --git a/frontend/src/Settings/Tags/Details/TagDetailsModal.js b/frontend/src/Settings/Tags/Details/TagDetailsModal.js
index 4195c64db..fabe69f53 100644
--- a/frontend/src/Settings/Tags/Details/TagDetailsModal.js
+++ b/frontend/src/Settings/Tags/Details/TagDetailsModal.js
@@ -13,7 +13,7 @@ function TagDetailsModal(props) {
 
   return (
     <Modal
-      size={sizes.SMALL}
+      size={sizes.MEDIUM}
       isOpen={isOpen}
       onModalClose={onModalClose}
     >
diff --git a/frontend/src/Settings/Tags/Details/TagDetailsModalContent.js b/frontend/src/Settings/Tags/Details/TagDetailsModalContent.js
index 78372d5a3..b97b83159 100644
--- a/frontend/src/Settings/Tags/Details/TagDetailsModalContent.js
+++ b/frontend/src/Settings/Tags/Details/TagDetailsModalContent.js
@@ -65,21 +65,15 @@ function TagDetailsModalContent(props) {
                 delayProfiles.map((item) => {
                   const {
                     id,
-                    preferredProtocol,
-                    enableUsenet,
-                    enableTorrent,
-                    usenetDelay,
-                    torrentDelay
+                    name,
+                    items
                   } = item;
 
                   return (
                     <TagDetailsDelayProfile
                       key={id}
-                      preferredProtocol={preferredProtocol}
-                      enableUsenet={enableUsenet}
-                      enableTorrent={enableTorrent}
-                      usenetDelay={usenetDelay}
-                      torrentDelay={torrentDelay}
+                      name={name}
+                      items={items}
                     />
                   );
                 })
diff --git a/frontend/src/Store/Actions/Settings/delayProfiles.js b/frontend/src/Store/Actions/Settings/delayProfiles.js
index 38abc5841..9c29f2c4c 100644
--- a/frontend/src/Store/Actions/Settings/delayProfiles.js
+++ b/frontend/src/Store/Actions/Settings/delayProfiles.js
@@ -52,6 +52,10 @@ export default {
     isFetching: false,
     isPopulated: false,
     error: null,
+    isSchemaFetching: false,
+    isSchemaPopulated: false,
+    schemaError: null,
+    schema: {},
     items: [],
     isSaving: false,
     saveError: null,
diff --git a/frontend/src/Store/Actions/appActions.js b/frontend/src/Store/Actions/appActions.js
index 972fd1be2..14c5e3fc6 100644
--- a/frontend/src/Store/Actions/appActions.js
+++ b/frontend/src/Store/Actions/appActions.js
@@ -55,6 +55,7 @@ export const defaultState = {
 
 export const SHOW_MESSAGE = 'app/showMessage';
 export const HIDE_MESSAGE = 'app/hideMessage';
+export const CLEAR_MESSAGES = 'app/clearMessages';
 export const SAVE_DIMENSIONS = 'app/saveDimensions';
 export const SET_VERSION = 'app/setVersion';
 export const SET_APP_VALUE = 'app/setAppValue';
@@ -72,6 +73,7 @@ export const setIsSidebarVisible = createAction(SET_IS_SIDEBAR_VISIBLE);
 export const setAppValue = createAction(SET_APP_VALUE);
 export const showMessage = createAction(SHOW_MESSAGE);
 export const hideMessage = createAction(HIDE_MESSAGE);
+export const clearMessages = createAction(CLEAR_MESSAGES);
 export const pingServer = createThunk(PING_SERVER);
 export const fetchTranslations = createThunk(FETCH_TRANSLATIONS);
 
@@ -192,6 +194,14 @@ export const reducers = createHandleActions({
     return updateSectionState(state, messagesSection, newState);
   },
 
+  [CLEAR_MESSAGES]: function(state) {
+    const newState = getSectionState(state, messagesSection);
+
+    newState.items = [];
+
+    return updateSectionState(state, messagesSection, newState);
+  },
+
   [SET_APP_VALUE]: function(state, { payload }) {
     const newState = Object.assign(getSectionState(state, section), payload);
 
diff --git a/frontend/src/Store/Actions/systemActions.js b/frontend/src/Store/Actions/systemActions.js
index 92360b589..ef7c66a27 100644
--- a/frontend/src/Store/Actions/systemActions.js
+++ b/frontend/src/Store/Actions/systemActions.js
@@ -70,6 +70,13 @@ export const defaultState = {
     items: []
   },
 
+  plugins: {
+    isFetching: false,
+    isPopulated: false,
+    error: null,
+    items: []
+  },
+
   logs: {
     isFetching: false,
     isPopulated: false,
@@ -199,6 +206,8 @@ export const DELETE_BACKUP = 'system/backups/deleteBackup';
 
 export const FETCH_UPDATES = 'system/updates/fetchUpdates';
 
+export const FETCH_INSTALLED_PLUGINS = 'system/plugins/fetchInstalledPlugins';
+
 export const FETCH_LOGS = 'system/logs/fetchLogs';
 export const GOTO_FIRST_LOGS_PAGE = 'system/logs/gotoLogsFirstPage';
 export const GOTO_PREVIOUS_LOGS_PAGE = 'system/logs/gotoLogsPreviousPage';
@@ -233,6 +242,8 @@ export const deleteBackup = createThunk(DELETE_BACKUP);
 
 export const fetchUpdates = createThunk(FETCH_UPDATES);
 
+export const fetchInstalledPlugins = createThunk(FETCH_INSTALLED_PLUGINS);
+
 export const fetchLogs = createThunk(FETCH_LOGS);
 export const gotoLogsFirstPage = createThunk(GOTO_FIRST_LOGS_PAGE);
 export const gotoLogsPreviousPage = createThunk(GOTO_PREVIOUS_LOGS_PAGE);
@@ -326,6 +337,7 @@ export const actionHandlers = handleThunks({
   [DELETE_BACKUP]: createRemoveItemHandler(backupsSection, '/system/backup'),
 
   [FETCH_UPDATES]: createFetchHandler('system.updates', '/update'),
+  [FETCH_INSTALLED_PLUGINS]: createFetchHandler('system.plugins', '/system/plugins'),
   [FETCH_LOG_FILES]: createFetchHandler('system.logFiles', '/log/file'),
   [FETCH_UPDATE_LOG_FILES]: createFetchHandler('system.updateLogFiles', '/log/file/update'),
 
diff --git a/frontend/src/System/Plugins/PluginRow.css b/frontend/src/System/Plugins/PluginRow.css
new file mode 100644
index 000000000..e30dca0d5
--- /dev/null
+++ b/frontend/src/System/Plugins/PluginRow.css
@@ -0,0 +1,11 @@
+.version {
+  composes: cell from '~Components/Table/Cells/TableRowCell.css';
+
+  width: 150px;
+}
+
+.actions {
+  composes: cell from '~Components/Table/Cells/TableRowCell.css';
+
+  width: 150px;
+}
diff --git a/frontend/src/System/Plugins/PluginRow.css.d.ts b/frontend/src/System/Plugins/PluginRow.css.d.ts
new file mode 100644
index 000000000..3da90eb42
--- /dev/null
+++ b/frontend/src/System/Plugins/PluginRow.css.d.ts
@@ -0,0 +1,8 @@
+// This file is automatically generated.
+// Please do not change this file!
+interface CssExports {
+  'actions': string;
+  'version': string;
+}
+export const cssExports: CssExports;
+export default cssExports;
diff --git a/frontend/src/System/Plugins/PluginRow.js b/frontend/src/System/Plugins/PluginRow.js
new file mode 100644
index 000000000..6b08759c3
--- /dev/null
+++ b/frontend/src/System/Plugins/PluginRow.js
@@ -0,0 +1,79 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import SpinnerIconButton from 'Components/Link/SpinnerIconButton';
+import TableRowCell from 'Components/Table/Cells/TableRowCell';
+import TableRow from 'Components/Table/TableRow';
+import { icons, kinds } from 'Helpers/Props';
+import styles from './PluginRow.css';
+
+class PluginRow extends Component {
+
+  //
+  // Listeners
+
+  onInstallPluginPress = () => {
+    this.props.onInstallPluginPress(this.props.githubUrl);
+  };
+
+  onUninstallPluginPress = () => {
+    this.props.onUninstallPluginPress(this.props.githubUrl);
+  };
+
+  //
+  // Render
+
+  render() {
+    const {
+      name,
+      owner,
+      installedVersion,
+      availableVersion,
+      updateAvailable,
+      isInstallingPlugin,
+      isUninstallingPlugin
+    } = this.props;
+
+    return (
+      <TableRow>
+        <TableRowCell>{name}</TableRowCell>
+        <TableRowCell>{owner}</TableRowCell>
+        <TableRowCell className={styles.version}>{installedVersion}</TableRowCell>
+        <TableRowCell className={styles.version}>{availableVersion}</TableRowCell>
+        <TableRowCell
+          className={styles.actions}
+        >
+          {
+            updateAvailable &&
+              <SpinnerIconButton
+                name={icons.UPDATE}
+                kind={kinds.DEFAULT}
+                isSpinning={isInstallingPlugin}
+                onPress={this.onInstallPluginPress}
+              />
+          }
+          <SpinnerIconButton
+            name={icons.DELETE}
+            kind={kinds.DEFAULT}
+            isSpinning={isUninstallingPlugin}
+            onPress={this.onUninstallPluginPress}
+          />
+        </TableRowCell>
+      </TableRow>
+    );
+  }
+}
+
+PluginRow.propTypes = {
+  githubUrl: PropTypes.string.isRequired,
+  name: PropTypes.string.isRequired,
+  owner: PropTypes.string.isRequired,
+  installedVersion: PropTypes.string.isRequired,
+  availableVersion: PropTypes.string.isRequired,
+  updateAvailable: PropTypes.bool.isRequired,
+  isInstallingPlugin: PropTypes.bool.isRequired,
+  onInstallPluginPress: PropTypes.func.isRequired,
+  isUninstallingPlugin: PropTypes.bool.isRequired,
+  onUninstallPluginPress: PropTypes.func.isRequired
+};
+
+export default PluginRow;
diff --git a/frontend/src/System/Plugins/Plugins.css b/frontend/src/System/Plugins/Plugins.css
new file mode 100644
index 000000000..914e89b6c
--- /dev/null
+++ b/frontend/src/System/Plugins/Plugins.css
@@ -0,0 +1,6 @@
+.loading {
+  composes: loading from '~Components/Loading/LoadingIndicator.css';
+
+  margin-top: 5px;
+  margin-left: auto;
+}
diff --git a/frontend/src/System/Plugins/Plugins.js b/frontend/src/System/Plugins/Plugins.js
new file mode 100644
index 000000000..0c041c211
--- /dev/null
+++ b/frontend/src/System/Plugins/Plugins.js
@@ -0,0 +1,168 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import FieldSet from 'Components/FieldSet';
+import Form from 'Components/Form/Form';
+import FormGroup from 'Components/Form/FormGroup';
+import FormInputGroup from 'Components/Form/FormInputGroup';
+import FormLabel from 'Components/Form/FormLabel';
+import SpinnerButton from 'Components/Link/SpinnerButton';
+import LoadingIndicator from 'Components/Loading/LoadingIndicator';
+import PageContent from 'Components/Page/PageContent';
+import PageContentBody from 'Components/Page/PageContentBody';
+import Table from 'Components/Table/Table';
+import TableBody from 'Components/Table/TableBody';
+import { inputTypes, kinds } from 'Helpers/Props';
+import PluginRow from './PluginRow';
+
+const columns = [
+  {
+    name: 'name',
+    label: 'Name',
+    isVisible: true
+  },
+  {
+    name: 'owner',
+    label: 'Owner',
+    isVisible: true
+  },
+  {
+    name: 'installedVersion',
+    label: 'Installed Version',
+    isVisible: true
+  },
+  {
+    name: 'availableVersion',
+    label: 'Available Version',
+    isVisible: true
+  },
+  {
+    name: 'actions',
+    isVisible: true
+  }
+];
+
+class Plugins extends Component {
+
+  //
+  // Lifecycle
+
+  constructor(props, context) {
+    super(props, context);
+
+    this.state = {
+      repoUrl: ''
+    };
+  }
+
+  //
+  // Listeners
+
+  onInputChange = ({ name, value }) => {
+    this.setState({
+      [name]: value
+    });
+  };
+
+  onInstallPluginPress = () => {
+    this.props.onInstallPluginPress(this.state.repoUrl);
+  };
+
+  //
+  // Render
+
+  render() {
+    const {
+      isPopulated,
+      error,
+      items,
+      isInstallingPlugin,
+      onInstallPluginPress,
+      isUninstallingPlugin,
+      onUninstallPluginPress
+    } = this.props;
+
+    const {
+      repoUrl
+    } = this.state;
+
+    const noPlugins = isPopulated && !error && !items.length;
+
+    return (
+      <PageContent title="Plugins">
+        <PageContentBody>
+          <Form>
+            <FieldSet legend="Install New Plugin">
+              <FormGroup>
+                <FormLabel>GitHub URL</FormLabel>
+
+                <FormInputGroup
+                  type={inputTypes.TEXT}
+                  name="repoUrl"
+                  helpText="URL to GitHub repository containing plugin"
+                  helpLink="https://wiki.servarr.com/Lidarr_FAQ#How_do_I_install_plugins"
+                  value={repoUrl}
+                  onChange={this.onInputChange}
+                />
+              </FormGroup>
+              <SpinnerButton
+                kind={kinds.PRIMARY}
+                isSpinning={isInstallingPlugin}
+                onPress={this.onInstallPluginPress}
+              >
+                Install
+              </SpinnerButton>
+            </FieldSet>
+          </Form>
+          <FieldSet legend="Installed Plugins">
+            {
+              !isPopulated && !error &&
+                <LoadingIndicator />
+            }
+
+            {
+              isPopulated && noPlugins &&
+                <div>No plugins are installed</div>
+            }
+
+            {
+              isPopulated && !noPlugins &&
+                <Table
+                  columns={columns}
+                >
+                  <TableBody>
+                    {
+                      items.map((plugin) => {
+                        return (
+                          <PluginRow
+                            key={plugin.githubUrl}
+                            {...plugin}
+                            isInstallingPlugin={isInstallingPlugin}
+                            isUninstallingPlugin={isUninstallingPlugin}
+                            onInstallPluginPress={onInstallPluginPress}
+                            onUninstallPluginPress={onUninstallPluginPress}
+                          />
+                        );
+                      })
+                    }
+                  </TableBody>
+                </Table>
+            }
+          </FieldSet>
+        </PageContentBody>
+      </PageContent>
+    );
+  }
+}
+
+Plugins.propTypes = {
+  isFetching: PropTypes.bool.isRequired,
+  isPopulated: PropTypes.bool.isRequired,
+  error: PropTypes.object,
+  items: PropTypes.array.isRequired,
+  isInstallingPlugin: PropTypes.bool.isRequired,
+  onInstallPluginPress: PropTypes.func.isRequired,
+  isUninstallingPlugin: PropTypes.bool.isRequired,
+  onUninstallPluginPress: PropTypes.func.isRequired
+};
+
+export default Plugins;
diff --git a/frontend/src/System/Plugins/PluginsConnector.js b/frontend/src/System/Plugins/PluginsConnector.js
new file mode 100644
index 000000000..5a87be330
--- /dev/null
+++ b/frontend/src/System/Plugins/PluginsConnector.js
@@ -0,0 +1,95 @@
+import PropTypes from 'prop-types';
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+import { createSelector } from 'reselect';
+import * as commandNames from 'Commands/commandNames';
+import { executeCommand } from 'Store/Actions/commandActions';
+import { fetchInstalledPlugins } from 'Store/Actions/systemActions';
+import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector';
+import { registerPagePopulator, unregisterPagePopulator } from 'Utilities/pagePopulator';
+import Plugins from './Plugins';
+
+function createMapStateToProps() {
+  return createSelector(
+    (state) => state.system.plugins,
+    createCommandExecutingSelector(commandNames.INSTALL_PLUGIN),
+    createCommandExecutingSelector(commandNames.UNINSTALL_PLUGIN),
+    (
+      plugins,
+      isInstallingPlugin,
+      isUninstallingPlugin
+    ) => {
+      return {
+        ...plugins,
+        isInstallingPlugin,
+        isUninstallingPlugin
+      };
+    }
+  );
+}
+
+const mapDispatchToProps = {
+  dispatchFetchInstalledPlugins: fetchInstalledPlugins,
+  dispatchExecuteCommand: executeCommand
+};
+
+class PluginsConnector extends Component {
+
+  //
+  // Lifecycle
+
+  componentDidMount() {
+    registerPagePopulator(this.repopulate);
+
+    this.repopulate();
+  }
+
+  componentWillUnmount() {
+    unregisterPagePopulator(this.repopulate);
+  }
+
+  //
+  // Control
+
+  repopulate = () => {
+    this.props.dispatchFetchInstalledPlugins();
+  };
+
+  //
+  // Listeners
+
+  onInstallPluginPress = (url) => {
+    this.props.dispatchExecuteCommand({
+      name: commandNames.INSTALL_PLUGIN,
+      githubUrl: url
+    });
+  };
+
+  onUninstallPluginPress = (url) => {
+    this.props.dispatchExecuteCommand({
+      name: commandNames.UNINSTALL_PLUGIN,
+      githubUrl: url
+    });
+  };
+
+  //
+  // Render
+
+  render() {
+    return (
+      <Plugins
+        onInstallPluginPress={this.onInstallPluginPress}
+        onUninstallPluginPress={this.onUninstallPluginPress}
+        {...this.props}
+      />
+    );
+  }
+
+}
+
+PluginsConnector.propTypes = {
+  dispatchFetchInstalledPlugins: PropTypes.func.isRequired,
+  dispatchExecuteCommand: PropTypes.func.isRequired
+};
+
+export default connect(createMapStateToProps, mapDispatchToProps)(PluginsConnector);
diff --git a/src/Lidarr.Api.V1/Blocklist/BlocklistResource.cs b/src/Lidarr.Api.V1/Blocklist/BlocklistResource.cs
index ac906b701..09f9db441 100644
--- a/src/Lidarr.Api.V1/Blocklist/BlocklistResource.cs
+++ b/src/Lidarr.Api.V1/Blocklist/BlocklistResource.cs
@@ -4,7 +4,6 @@ using Lidarr.Api.V1.Artist;
 using Lidarr.Api.V1.CustomFormats;
 using Lidarr.Http.REST;
 using NzbDrone.Core.CustomFormats;
-using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Qualities;
 
 namespace Lidarr.Api.V1.Blocklist
@@ -17,7 +16,7 @@ namespace Lidarr.Api.V1.Blocklist
         public QualityModel Quality { get; set; }
         public List<CustomFormatResource> CustomFormats { get; set; }
         public DateTime Date { get; set; }
-        public DownloadProtocol Protocol { get; set; }
+        public string Protocol { get; set; }
         public string Indexer { get; set; }
         public string Message { get; set; }
 
diff --git a/src/Lidarr.Api.V1/Commands/CommandController.cs b/src/Lidarr.Api.V1/Commands/CommandController.cs
index 1f008e5e4..8d5a44389 100644
--- a/src/Lidarr.Api.V1/Commands/CommandController.cs
+++ b/src/Lidarr.Api.V1/Commands/CommandController.cs
@@ -66,8 +66,9 @@ namespace Lidarr.Api.V1.Commands
                     ? CommandPriority.High
                     : CommandPriority.Normal;
 
-                var command = STJson.Deserialize(body, commandType) as Command;
+                dynamic command = STJson.Deserialize(body, commandType);
 
+                command.Trigger = CommandTrigger.Manual;
                 command.SuppressMessages = !command.SendUpdatesToClient;
                 command.SendUpdatesToClient = true;
                 command.ClientUserAgent = Request.Headers["UserAgent"];
diff --git a/src/Lidarr.Api.V1/DownloadClient/DownloadClientResource.cs b/src/Lidarr.Api.V1/DownloadClient/DownloadClientResource.cs
index 0e5e60bed..ca5bb1a43 100644
--- a/src/Lidarr.Api.V1/DownloadClient/DownloadClientResource.cs
+++ b/src/Lidarr.Api.V1/DownloadClient/DownloadClientResource.cs
@@ -1,12 +1,11 @@
 using NzbDrone.Core.Download;
-using NzbDrone.Core.Indexers;
 
 namespace Lidarr.Api.V1.DownloadClient
 {
     public class DownloadClientResource : ProviderResource<DownloadClientResource>
     {
         public bool Enable { get; set; }
-        public DownloadProtocol Protocol { get; set; }
+        public string Protocol { get; set; }
         public int Priority { get; set; }
         public bool RemoveCompletedDownloads { get; set; }
         public bool RemoveFailedDownloads { get; set; }
diff --git a/src/Lidarr.Api.V1/Indexers/IndexerResource.cs b/src/Lidarr.Api.V1/Indexers/IndexerResource.cs
index 2514ac5da..3f751d107 100644
--- a/src/Lidarr.Api.V1/Indexers/IndexerResource.cs
+++ b/src/Lidarr.Api.V1/Indexers/IndexerResource.cs
@@ -9,7 +9,7 @@ namespace Lidarr.Api.V1.Indexers
         public bool EnableInteractiveSearch { get; set; }
         public bool SupportsRss { get; set; }
         public bool SupportsSearch { get; set; }
-        public DownloadProtocol Protocol { get; set; }
+        public string Protocol { get; set; }
         public int Priority { get; set; }
         public int DownloadClientId { get; set; }
     }
diff --git a/src/Lidarr.Api.V1/Indexers/ReleaseResource.cs b/src/Lidarr.Api.V1/Indexers/ReleaseResource.cs
index cc8261bcc..a2fcfc296 100644
--- a/src/Lidarr.Api.V1/Indexers/ReleaseResource.cs
+++ b/src/Lidarr.Api.V1/Indexers/ReleaseResource.cs
@@ -48,7 +48,7 @@ namespace Lidarr.Api.V1.Indexers
         public string InfoHash { get; set; }
         public int? Seeders { get; set; }
         public int? Leechers { get; set; }
-        public DownloadProtocol Protocol { get; set; }
+        public string Protocol { get; set; }
         public int IndexerFlags { get; set; }
 
         // Sent when queuing an unknown release
@@ -125,7 +125,7 @@ namespace Lidarr.Api.V1.Indexers
         {
             ReleaseInfo model;
 
-            if (resource.Protocol == DownloadProtocol.Torrent)
+            if (resource.Protocol == nameof(TorrentDownloadProtocol))
             {
                 model = new TorrentInfo
                 {
diff --git a/src/Lidarr.Api.V1/Profiles/Delay/DelayProfileController.cs b/src/Lidarr.Api.V1/Profiles/Delay/DelayProfileController.cs
index 414d26fae..8e7da390e 100644
--- a/src/Lidarr.Api.V1/Profiles/Delay/DelayProfileController.cs
+++ b/src/Lidarr.Api.V1/Profiles/Delay/DelayProfileController.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using FluentValidation;
 using Lidarr.Http;
 using Lidarr.Http.REST;
@@ -21,16 +22,8 @@ namespace Lidarr.Api.V1.Profiles.Delay
             SharedValidator.RuleFor(d => d.Tags).NotEmpty().When(d => d.Id != 1);
             SharedValidator.RuleFor(d => d.Tags).EmptyCollection<DelayProfileResource, int>().When(d => d.Id == 1);
             SharedValidator.RuleFor(d => d.Tags).SetValidator(tagInUseValidator);
-            SharedValidator.RuleFor(d => d.UsenetDelay).GreaterThanOrEqualTo(0);
-            SharedValidator.RuleFor(d => d.TorrentDelay).GreaterThanOrEqualTo(0);
-
-            SharedValidator.RuleFor(d => d).Custom((delayProfile, context) =>
-            {
-                if (!delayProfile.EnableUsenet && !delayProfile.EnableTorrent)
-                {
-                    context.AddFailure("Either Usenet or Torrent should be enabled");
-                }
-            });
+            SharedValidator.RuleFor(d => d.Items).Must(items => items.All(x => x.Delay >= 0)).WithMessage("Protocols cannot have a negative delay");
+            SharedValidator.RuleFor(d => d.Items).Must(items => items.Any(x => x.Allowed)).WithMessage("At least one protocol must be enabled");
         }
 
         [RestPostById]
diff --git a/src/Lidarr.Api.V1/Profiles/Delay/DelayProfileProtocolItemResource.cs b/src/Lidarr.Api.V1/Profiles/Delay/DelayProfileProtocolItemResource.cs
new file mode 100644
index 000000000..adf8adbda
--- /dev/null
+++ b/src/Lidarr.Api.V1/Profiles/Delay/DelayProfileProtocolItemResource.cs
@@ -0,0 +1,47 @@
+using NzbDrone.Core.Profiles.Delay;
+
+namespace Lidarr.Api.V1.Profiles.Delay
+{
+    public class DelayProfileProtocolItemResource
+    {
+        public string Name { get; set; }
+        public string Protocol { get; set; }
+        public bool Allowed { get; set; }
+        public int Delay { get; set; }
+    }
+
+    public static class ProfileItemResourceMapper
+    {
+        public static DelayProfileProtocolItemResource ToResource(this DelayProfileProtocolItem model)
+        {
+            if (model == null)
+            {
+                return null;
+            }
+
+            return new DelayProfileProtocolItemResource
+            {
+                Name = model.Name,
+                Protocol = model.Protocol,
+                Allowed = model.Allowed,
+                Delay = model.Delay
+            };
+        }
+
+        public static DelayProfileProtocolItem ToModel(this DelayProfileProtocolItemResource resource)
+        {
+            if (resource == null)
+            {
+                return null;
+            }
+
+            return new DelayProfileProtocolItem
+            {
+                Name = resource.Name,
+                Protocol = resource.Protocol,
+                Allowed = resource.Allowed,
+                Delay = resource.Delay
+            };
+        }
+    }
+}
diff --git a/src/Lidarr.Api.V1/Profiles/Delay/DelayProfileResource.cs b/src/Lidarr.Api.V1/Profiles/Delay/DelayProfileResource.cs
index 1e5c7f1da..c0bf0a086 100644
--- a/src/Lidarr.Api.V1/Profiles/Delay/DelayProfileResource.cs
+++ b/src/Lidarr.Api.V1/Profiles/Delay/DelayProfileResource.cs
@@ -1,18 +1,14 @@
 using System.Collections.Generic;
 using System.Linq;
 using Lidarr.Http.REST;
-using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Profiles.Delay;
 
 namespace Lidarr.Api.V1.Profiles.Delay
 {
     public class DelayProfileResource : RestResource
     {
-        public bool EnableUsenet { get; set; }
-        public bool EnableTorrent { get; set; }
-        public DownloadProtocol PreferredProtocol { get; set; }
-        public int UsenetDelay { get; set; }
-        public int TorrentDelay { get; set; }
+        public string Name { get; set; }
+        public List<DelayProfileProtocolItemResource> Items { get; set; }
         public bool BypassIfHighestQuality { get; set; }
         public bool BypassIfAboveCustomFormatScore { get; set; }
         public int MinimumCustomFormatScore { get; set; }
@@ -32,12 +28,8 @@ namespace Lidarr.Api.V1.Profiles.Delay
             return new DelayProfileResource
             {
                 Id = model.Id,
-
-                EnableUsenet = model.EnableUsenet,
-                EnableTorrent = model.EnableTorrent,
-                PreferredProtocol = model.PreferredProtocol,
-                UsenetDelay = model.UsenetDelay,
-                TorrentDelay = model.TorrentDelay,
+                Name = model.Name,
+                Items = model.Items.Select(x => x.ToResource()).ToList(),
                 BypassIfHighestQuality = model.BypassIfHighestQuality,
                 BypassIfAboveCustomFormatScore = model.BypassIfAboveCustomFormatScore,
                 MinimumCustomFormatScore = model.MinimumCustomFormatScore,
@@ -56,12 +48,8 @@ namespace Lidarr.Api.V1.Profiles.Delay
             return new DelayProfile
             {
                 Id = resource.Id,
-
-                EnableUsenet = resource.EnableUsenet,
-                EnableTorrent = resource.EnableTorrent,
-                PreferredProtocol = resource.PreferredProtocol,
-                UsenetDelay = resource.UsenetDelay,
-                TorrentDelay = resource.TorrentDelay,
+                Name = resource.Name,
+                Items = resource.Items.Select(x => x.ToModel()).ToList(),
                 BypassIfHighestQuality = resource.BypassIfHighestQuality,
                 BypassIfAboveCustomFormatScore = resource.BypassIfAboveCustomFormatScore,
                 MinimumCustomFormatScore = resource.MinimumCustomFormatScore,
diff --git a/src/Lidarr.Api.V1/Profiles/Delay/DelayProfileSchemaController.cs b/src/Lidarr.Api.V1/Profiles/Delay/DelayProfileSchemaController.cs
new file mode 100644
index 000000000..37f98d60c
--- /dev/null
+++ b/src/Lidarr.Api.V1/Profiles/Delay/DelayProfileSchemaController.cs
@@ -0,0 +1,22 @@
+using Lidarr.Http;
+using Lidarr.Http.REST;
+using NzbDrone.Core.Profiles.Delay;
+
+namespace Lidarr.Api.V1.Profiles.Delay
+{
+    [V1ApiController("delayprofile/schema")]
+    public class DelayProfileSchemaController : RestController<DelayProfileResource>
+    {
+        private readonly IDelayProfileService _profileService;
+
+        public DelayProfileSchemaController(IDelayProfileService profileService)
+        {
+            _profileService = profileService;
+        }
+
+        public override DelayProfileResource GetResourceById(int id)
+        {
+            return _profileService.GetDefaultProfile().ToResource();
+        }
+    }
+}
diff --git a/src/Lidarr.Api.V1/ProviderResource.cs b/src/Lidarr.Api.V1/ProviderResource.cs
index 0bd7aa6d3..1247f8cde 100644
--- a/src/Lidarr.Api.V1/ProviderResource.cs
+++ b/src/Lidarr.Api.V1/ProviderResource.cs
@@ -63,7 +63,7 @@ namespace Lidarr.Api.V1
                 Tags = resource.Tags
             };
 
-            var configContract = ReflectionExtensions.CoreAssembly.FindTypeByName(definition.ConfigContract);
+            var configContract = ReflectionExtensions.FindTypeByName(definition.ConfigContract);
             definition.Settings = (IProviderConfig)SchemaBuilder.ReadFromSchema(resource.Fields, configContract, existingDefinition?.Settings);
 
             return definition;
diff --git a/src/Lidarr.Api.V1/Queue/QueueController.cs b/src/Lidarr.Api.V1/Queue/QueueController.cs
index 730b50436..f10b1452e 100644
--- a/src/Lidarr.Api.V1/Queue/QueueController.cs
+++ b/src/Lidarr.Api.V1/Queue/QueueController.cs
@@ -13,7 +13,6 @@ using NzbDrone.Core.Datastore.Events;
 using NzbDrone.Core.Download;
 using NzbDrone.Core.Download.Pending;
 using NzbDrone.Core.Download.TrackedDownloads;
-using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.Profiles.Qualities;
 using NzbDrone.Core.Qualities;
@@ -130,7 +129,7 @@ namespace Lidarr.Api.V1.Queue
 
         [HttpGet]
         [Produces("application/json")]
-        public PagingResource<QueueResource> GetQueue([FromQuery] PagingRequestResource paging, bool includeUnknownArtistItems = false, bool includeArtist = false, bool includeAlbum = false, [FromQuery] int[] artistIds = null, DownloadProtocol? protocol = null, [FromQuery] int[] quality = null)
+        public PagingResource<QueueResource> GetQueue([FromQuery] PagingRequestResource paging, bool includeUnknownArtistItems = false, bool includeArtist = false, bool includeAlbum = false, [FromQuery] int[] artistIds = null, string protocol = null, [FromQuery] int[] quality = null)
         {
             var pagingResource = new PagingResource<QueueResource>(paging);
             var pagingSpec = pagingResource.MapToPagingSpec<QueueResource, NzbDrone.Core.Queue.Queue>("timeleft", SortDirection.Ascending);
@@ -138,7 +137,7 @@ namespace Lidarr.Api.V1.Queue
             return pagingSpec.ApplyToPage((spec) => GetQueue(spec, artistIds?.ToHashSet(), protocol, quality?.ToHashSet(), includeUnknownArtistItems), (q) => MapToResource(q, includeArtist, includeAlbum));
         }
 
-        private PagingSpec<NzbDrone.Core.Queue.Queue> GetQueue(PagingSpec<NzbDrone.Core.Queue.Queue> pagingSpec, HashSet<int> artistIds, DownloadProtocol? protocol, HashSet<int> quality, bool includeUnknownArtistItems)
+        private PagingSpec<NzbDrone.Core.Queue.Queue> GetQueue(PagingSpec<NzbDrone.Core.Queue.Queue> pagingSpec, HashSet<int> artistIds, string protocol, HashSet<int> quality, bool includeUnknownArtistItems)
         {
             var ascending = pagingSpec.SortDirection == SortDirection.Ascending;
             var orderByFunc = GetOrderByFunc(pagingSpec);
@@ -159,9 +158,9 @@ namespace Lidarr.Api.V1.Queue
                     include &= q.Artist != null && artistIds.Contains(q.Artist.Id);
                 }
 
-                if (include && protocol.HasValue)
+                if (include && protocol.IsNotNullOrWhiteSpace())
                 {
-                    include &= q.Protocol == protocol.Value;
+                    include &= q.Protocol == protocol;
                 }
 
                 if (include && hasQualityFilter)
diff --git a/src/Lidarr.Api.V1/Queue/QueueResource.cs b/src/Lidarr.Api.V1/Queue/QueueResource.cs
index e8458909f..7938fda14 100644
--- a/src/Lidarr.Api.V1/Queue/QueueResource.cs
+++ b/src/Lidarr.Api.V1/Queue/QueueResource.cs
@@ -7,7 +7,6 @@ using Lidarr.Api.V1.CustomFormats;
 using Lidarr.Http.REST;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Download.TrackedDownloads;
-using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Qualities;
 
 namespace Lidarr.Api.V1.Queue
@@ -33,7 +32,7 @@ namespace Lidarr.Api.V1.Queue
         public List<TrackedDownloadStatusMessage> StatusMessages { get; set; }
         public string ErrorMessage { get; set; }
         public string DownloadId { get; set; }
-        public DownloadProtocol Protocol { get; set; }
+        public string Protocol { get; set; }
         public string DownloadClient { get; set; }
         public bool DownloadClientHasPostImportCategory { get; set; }
         public string Indexer { get; set; }
diff --git a/src/Lidarr.Api.V1/System/Plugins/PluginController.cs b/src/Lidarr.Api.V1/System/Plugins/PluginController.cs
new file mode 100644
index 000000000..294f48107
--- /dev/null
+++ b/src/Lidarr.Api.V1/System/Plugins/PluginController.cs
@@ -0,0 +1,24 @@
+using System.Collections.Generic;
+using Lidarr.Http;
+using Microsoft.AspNetCore.Mvc;
+using NzbDrone.Core.Plugins;
+
+namespace Lidarr.Api.V1.System.Plugins
+{
+    [V1ApiController("system/plugins")]
+    public class PluginController : Controller
+    {
+        private readonly IPluginService _pluginService;
+
+        public PluginController(IPluginService pluginService)
+        {
+            _pluginService = pluginService;
+        }
+
+        [HttpGet]
+        public List<PluginResource> GetInstalledPlugins()
+        {
+            return _pluginService.GetInstalledPlugins().ToResource();
+        }
+    }
+}
diff --git a/src/Lidarr.Api.V1/System/Plugins/PluginResource.cs b/src/Lidarr.Api.V1/System/Plugins/PluginResource.cs
new file mode 100644
index 000000000..4b757735f
--- /dev/null
+++ b/src/Lidarr.Api.V1/System/Plugins/PluginResource.cs
@@ -0,0 +1,38 @@
+using System.Collections.Generic;
+using System.Linq;
+using Lidarr.Http.REST;
+using NzbDrone.Core.Plugins;
+
+namespace Lidarr.Api.V1.System.Plugins
+{
+    public class PluginResource : RestResource
+    {
+        public string Name { get; set; }
+        public string Owner { get; set; }
+        public string GithubUrl { get; set; }
+        public string InstalledVersion { get; set; }
+        public string AvailableVersion { get; set; }
+        public bool UpdateAvailable { get; set; }
+    }
+
+    public static class PluginResourceMapper
+    {
+        public static PluginResource ToResource(this IPlugin plugin)
+        {
+            return new PluginResource
+            {
+                Name = plugin.Name,
+                Owner = plugin.Owner,
+                GithubUrl = plugin.GithubUrl,
+                InstalledVersion = plugin.InstalledVersion.ToString(),
+                AvailableVersion = plugin.AvailableVersion.ToString(),
+                UpdateAvailable = plugin.AvailableVersion > plugin.InstalledVersion
+            };
+        }
+
+        public static List<PluginResource> ToResource(this IEnumerable<IPlugin> plugins)
+        {
+            return plugins.Select(ToResource).ToList();
+        }
+    }
+}
diff --git a/src/NzbDrone.Common.Test/ReflectionTests/ReflectionExtensionFixture.cs b/src/NzbDrone.Common.Test/ReflectionTests/ReflectionExtensionFixture.cs
index 4480b6449..532d3e1bc 100644
--- a/src/NzbDrone.Common.Test/ReflectionTests/ReflectionExtensionFixture.cs
+++ b/src/NzbDrone.Common.Test/ReflectionTests/ReflectionExtensionFixture.cs
@@ -1,4 +1,3 @@
-using System.Reflection;
 using FluentAssertions;
 using NUnit.Framework;
 using NzbDrone.Common.Reflection;
@@ -12,7 +11,7 @@ namespace NzbDrone.Common.Test.ReflectionTests
         [Test]
         public void should_get_properties_from_models()
         {
-            var models = Assembly.Load("Lidarr.Core").ImplementationsOf<ModelBase>();
+            var models = Reflection.ReflectionExtensions.ImplementationsOf<ModelBase>();
 
             foreach (var model in models)
             {
@@ -23,7 +22,7 @@ namespace NzbDrone.Common.Test.ReflectionTests
         [Test]
         public void should_be_able_to_get_implementations()
         {
-            var models = Assembly.Load("Lidarr.Core").ImplementationsOf<ModelBase>();
+            var models = Reflection.ReflectionExtensions.ImplementationsOf<ModelBase>();
 
             models.Should().NotBeEmpty();
         }
diff --git a/src/NzbDrone.Common.Test/ServiceFactoryFixture.cs b/src/NzbDrone.Common.Test/ServiceFactoryFixture.cs
index 5ed08a3db..5bbc40749 100644
--- a/src/NzbDrone.Common.Test/ServiceFactoryFixture.cs
+++ b/src/NzbDrone.Common.Test/ServiceFactoryFixture.cs
@@ -7,6 +7,7 @@ using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Common.Composition;
 using NzbDrone.Common.Composition.Extensions;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Instrumentation.Extensions;
@@ -15,7 +16,6 @@ using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Datastore.Extensions;
 using NzbDrone.Core.Lifecycle;
 using NzbDrone.Core.Messaging.Events;
-using NzbDrone.Host;
 using NzbDrone.Test.Common;
 
 namespace NzbDrone.Common.Test
@@ -26,9 +26,10 @@ namespace NzbDrone.Common.Test
         [Test]
         public void event_handlers_should_be_unique()
         {
+            var assemblies = AssemblyLoader.LoadBaseAssemblies();
             var container = new Container(rules => rules.WithNzbDroneRules())
                 .AddNzbDroneLogger()
-                .AutoAddServices(Bootstrap.ASSEMBLIES)
+                .AutoAddServices(assemblies)
                 .AddDummyDatabase()
                 .AddStartupContext(new StartupContext("first", "second"));
 
diff --git a/src/NzbDrone.Common/Composition/AssemblyLoader.cs b/src/NzbDrone.Common/Composition/AssemblyLoader.cs
index e0afe64e6..e5a9270c0 100644
--- a/src/NzbDrone.Common/Composition/AssemblyLoader.cs
+++ b/src/NzbDrone.Common/Composition/AssemblyLoader.cs
@@ -9,17 +9,38 @@ using NzbDrone.Common.EnvironmentInfo;
 
 namespace NzbDrone.Common.Composition
 {
-    public class AssemblyLoader
+    public static class AssemblyLoader
     {
+        private static readonly string[] BaseAssemblies =
+        {
+            "Lidarr.Host",
+            "Lidarr.Core",
+            "Lidarr.SignalR",
+            "Lidarr.Api.V1",
+            "Lidarr.Http"
+        };
+
+        private static readonly string[] UpdateAssemblies = { "Lidarr.Update" };
+
         static AssemblyLoader()
         {
             AppDomain.CurrentDomain.AssemblyResolve += new ResolveEventHandler(ContainerResolveEventHandler);
             RegisterSQLiteResolver();
         }
 
-        public static IList<Assembly> Load(IList<string> assemblyNames)
+        public static List<Assembly> LoadBaseAssemblies()
+        {
+            return Load(BaseAssemblies);
+        }
+
+        public static List<Assembly> LoadUpdateAssemblies()
+        {
+            return Load(UpdateAssemblies);
+        }
+
+        private static List<Assembly> Load(IList<string> assemblies)
         {
-            var toLoad = assemblyNames.ToList();
+            var toLoad = assemblies.ToList();
             toLoad.Add("Lidarr.Common");
             toLoad.Add(OsInfo.IsWindows ? "Lidarr.Windows" : "Lidarr.Mono");
 
diff --git a/src/NzbDrone.Common/Composition/Extensions.cs b/src/NzbDrone.Common/Composition/Extensions.cs
index 7976fa9f4..351a17df1 100644
--- a/src/NzbDrone.Common/Composition/Extensions.cs
+++ b/src/NzbDrone.Common/Composition/Extensions.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 using DryIoc;
 using NzbDrone.Common.EnvironmentInfo;
 
@@ -20,10 +21,8 @@ namespace NzbDrone.Common.Composition.Extensions
             return container;
         }
 
-        public static IContainer AutoAddServices(this IContainer container, List<string> assemblyNames)
+        public static IContainer AutoAddServices(this IContainer container, List<Assembly> assemblies)
         {
-            var assemblies = AssemblyLoader.Load(assemblyNames);
-
             container.RegisterMany(assemblies,
                 serviceTypeCondition: type => type.IsInterface && !string.IsNullOrWhiteSpace(type.FullName) && !type.FullName.StartsWith("System"),
                 reuse: Reuse.Singleton);
@@ -37,5 +36,17 @@ namespace NzbDrone.Common.Composition.Extensions
 
             return container;
         }
+
+        public static IContainer SetPluginStatus(this IContainer container, bool enabled)
+        {
+            var pluginStatus = new PluginStatus
+            {
+                Enabled = enabled
+            };
+
+            container.RegisterInstance(pluginStatus);
+
+            return container;
+        }
     }
 }
diff --git a/src/NzbDrone.Common/Composition/PluginLoadContext.cs b/src/NzbDrone.Common/Composition/PluginLoadContext.cs
new file mode 100644
index 000000000..37ddb6705
--- /dev/null
+++ b/src/NzbDrone.Common/Composition/PluginLoadContext.cs
@@ -0,0 +1,41 @@
+using System;
+using System.IO;
+using System.Reflection;
+using System.Runtime.Loader;
+
+namespace NzbDrone.Common.Composition
+{
+    public class PluginLoadContext : AssemblyLoadContext
+    {
+        private AssemblyDependencyResolver _resolver;
+
+        public PluginLoadContext(string pluginPath)
+            : base(isCollectible: true)
+        {
+            _resolver = new AssemblyDependencyResolver(pluginPath);
+        }
+
+        protected override Assembly Load(AssemblyName assemblyName)
+        {
+            var assemblyPath = _resolver.ResolveAssemblyToPath(assemblyName);
+            if (assemblyPath != null)
+            {
+                using var fs = new FileStream(assemblyPath, FileMode.Open, FileAccess.Read);
+                return LoadFromStream(fs);
+            }
+
+            return null;
+        }
+
+        protected override IntPtr LoadUnmanagedDll(string unmanagedDllName)
+        {
+            var libraryPath = _resolver.ResolveUnmanagedDllToPath(unmanagedDllName);
+            if (libraryPath != null)
+            {
+                return LoadUnmanagedDllFromPath(libraryPath);
+            }
+
+            return IntPtr.Zero;
+        }
+    }
+}
diff --git a/src/NzbDrone.Common/Composition/PluginLoader.cs b/src/NzbDrone.Common/Composition/PluginLoader.cs
new file mode 100644
index 000000000..d72aced44
--- /dev/null
+++ b/src/NzbDrone.Common/Composition/PluginLoader.cs
@@ -0,0 +1,81 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using NLog;
+using NzbDrone.Common.Instrumentation;
+
+namespace NzbDrone.Common.Composition
+{
+    public static class PluginLoader
+    {
+        private static readonly Logger Logger = NzbDroneLogger.GetLogger(typeof(PluginLoader));
+
+        public static (List<Assembly>, List<WeakReference>) LoadPlugins(IEnumerable<string> pluginPaths)
+        {
+            var assemblies = new List<Assembly>();
+            var pluginRefs = new List<WeakReference>();
+
+            foreach (var pluginPath in pluginPaths)
+            {
+                (var plugin, var pluginRef) = LoadPlugin(pluginPath);
+                pluginRefs.Add(pluginRef);
+                assemblies.Add(plugin);
+            }
+
+            return (assemblies, pluginRefs);
+        }
+
+        public static bool UnloadPlugins(List<WeakReference> pluginRefs)
+        {
+            RequestPluginUnload(pluginRefs);
+            return AwaitPluginUnload(pluginRefs);
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private static (Assembly, WeakReference) LoadPlugin(string path)
+        {
+            var context = new PluginLoadContext(path);
+            var weakRef = new WeakReference(context, trackResurrection: true);
+
+            // load from stream to avoid locking on windows
+            using var fs = new FileStream(path, FileMode.Open, FileAccess.Read);
+            var assembly = context.LoadFromStream(fs);
+
+            return (assembly, weakRef);
+        }
+
+        private static void RequestPluginUnload(List<WeakReference> pluginRefs)
+        {
+            foreach (var pluginRef in pluginRefs)
+            {
+                if (pluginRef?.Target != null)
+                {
+                    ((PluginLoadContext)pluginRef.Target).Unload();
+                }
+            }
+        }
+
+        private static bool AwaitPluginUnload(List<WeakReference> pluginRefs)
+        {
+            var i = 0;
+            foreach (var pluginRef in pluginRefs.Where(x => x != null))
+            {
+                while (pluginRef.IsAlive)
+                {
+                    GC.Collect();
+                    GC.WaitForPendingFinalizers();
+
+                    if (i++ >= 10)
+                    {
+                        return false;
+                    }
+                }
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/src/NzbDrone.Common/Composition/PluginStatus.cs b/src/NzbDrone.Common/Composition/PluginStatus.cs
new file mode 100644
index 000000000..117b25424
--- /dev/null
+++ b/src/NzbDrone.Common/Composition/PluginStatus.cs
@@ -0,0 +1,7 @@
+namespace NzbDrone.Common.Composition
+{
+    public class PluginStatus
+    {
+        public bool Enabled { get; set; }
+    }
+}
diff --git a/src/NzbDrone.Common/Extensions/PathExtensions.cs b/src/NzbDrone.Common/Extensions/PathExtensions.cs
index dad4cdc5f..292ae5522 100644
--- a/src/NzbDrone.Common/Extensions/PathExtensions.cs
+++ b/src/NzbDrone.Common/Extensions/PathExtensions.cs
@@ -17,6 +17,7 @@ namespace NzbDrone.Common.Extensions
         private const string LOG_DB = "logs.db";
         private const string NLOG_CONFIG_FILE = "nlog.config";
         private const string UPDATE_CLIENT_EXE_NAME = "Lidarr.Update";
+        private const string PLUGIN_FOLDER_NAME = "plugins";
 
         private static readonly string UPDATE_SANDBOX_FOLDER_NAME = "lidarr_update" + Path.DirectorySeparatorChar;
         private static readonly string UPDATE_PACKAGE_FOLDER_NAME = "Lidarr" + Path.DirectorySeparatorChar;
@@ -310,6 +311,26 @@ namespace NzbDrone.Common.Extensions
             return Path.Combine(GetAppDataPath(appFolderInfo), APP_CONFIG_FILE);
         }
 
+        public static string GetPluginPath(this IAppFolderInfo appFolderInfo)
+        {
+            return Path.Combine(GetAppDataPath(appFolderInfo), PLUGIN_FOLDER_NAME);
+        }
+
+        public static List<string> GetPluginAssemblies(this IAppFolderInfo appFolderInfo)
+        {
+            var pluginFolder = appFolderInfo.GetPluginPath();
+
+            if (!Directory.Exists(pluginFolder))
+            {
+                return new List<string>();
+            }
+
+            return Directory.GetDirectories(pluginFolder)
+                .SelectMany(owner => Directory.GetDirectories(owner)
+                    .SelectMany(folder => Directory.GetFiles(folder, "Lidarr.Plugin.*.dll").ToList()))
+                .ToList();
+        }
+
         public static string GetMediaCoverPath(this IAppFolderInfo appFolderInfo)
         {
             return Path.Combine(GetAppDataPath(appFolderInfo), "MediaCover");
diff --git a/src/NzbDrone.Common/Reflection/ReflectionExtensions.cs b/src/NzbDrone.Common/Reflection/ReflectionExtensions.cs
index 8f016450d..3c25cf18e 100644
--- a/src/NzbDrone.Common/Reflection/ReflectionExtensions.cs
+++ b/src/NzbDrone.Common/Reflection/ReflectionExtensions.cs
@@ -7,17 +7,15 @@ namespace NzbDrone.Common.Reflection
 {
     public static class ReflectionExtensions
     {
-        public static readonly Assembly CoreAssembly = Assembly.Load("Lidarr.Core");
-
         public static List<PropertyInfo> GetSimpleProperties(this Type type)
         {
             var properties = type.GetProperties();
             return properties.Where(c => c.PropertyType.IsSimpleType()).ToList();
         }
 
-        public static List<Type> ImplementationsOf<T>(this Assembly assembly)
+        public static List<Type> ImplementationsOf<T>()
         {
-            return assembly.GetExportedTypes().Where(c => typeof(T).IsAssignableFrom(c)).ToList();
+            return GetAllTypes().Where(c => typeof(T).IsAssignableFrom(c)).ToList();
         }
 
         public static bool IsSimpleType(this Type type)
@@ -71,6 +69,32 @@ namespace NzbDrone.Common.Reflection
             return assembly.GetExportedTypes().SingleOrDefault(c => c.Name.Equals(name, StringComparison.InvariantCultureIgnoreCase));
         }
 
+        public static Type FindTypeByName(string name)
+        {
+            return GetAllTypes()
+                .SingleOrDefault(x => x.Name.Equals(name, StringComparison.InvariantCultureIgnoreCase));
+        }
+
+        private static IEnumerable<Type> GetAllTypes()
+        {
+            var assemblies = AppDomain.CurrentDomain.GetAssemblies();
+
+            return assemblies
+                .Where(x => ShouldUseAssembly(x))
+                .SelectMany(x => x.GetExportedTypes());
+        }
+
+        private static bool ShouldUseAssembly(Assembly assembly)
+        {
+            if (assembly.IsDynamic)
+            {
+                return false;
+            }
+
+            var name = assembly.GetName();
+            return name.Name == "Lidarr.Core" || name.Name.Contains("Lidarr.Plugin");
+        }
+
         public static bool HasAttribute<TAttribute>(this Type type)
         {
             return type.GetCustomAttributes(typeof(TAttribute), true).Any();
diff --git a/src/NzbDrone.Core.Test/Blocklisting/BlocklistServiceFixture.cs b/src/NzbDrone.Core.Test/Blocklisting/BlocklistServiceFixture.cs
index 7e5d41977..f8b3fc2ac 100644
--- a/src/NzbDrone.Core.Test/Blocklisting/BlocklistServiceFixture.cs
+++ b/src/NzbDrone.Core.Test/Blocklisting/BlocklistServiceFixture.cs
@@ -1,9 +1,10 @@
-using System;
+using System;
 using System.Collections.Generic;
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Core.Blocklisting;
 using NzbDrone.Core.Download;
+using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Qualities;
 using NzbDrone.Core.Test.Framework;
 
@@ -30,8 +31,10 @@ namespace NzbDrone.Core.Test.Blocklisting
             _event.Data.Add("publishedDate", DateTime.UtcNow.ToString("s") + "Z");
             _event.Data.Add("size", "1000");
             _event.Data.Add("indexer", "nzbs.org");
-            _event.Data.Add("protocol", "1");
+            _event.Data.Add("protocol", nameof(UsenetDownloadProtocol));
             _event.Data.Add("message", "Marked as failed");
+
+            Mocker.SetConstant<IBlocklistForProtocol>(Mocker.Resolve<UsenetBlocklist>());
         }
 
         [Test]
diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/AlreadyImportedSpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/AlreadyImportedSpecificationFixture.cs
index 9f253b70d..af307057b 100644
--- a/src/NzbDrone.Core.Test/DecisionEngineTests/AlreadyImportedSpecificationFixture.cs
+++ b/src/NzbDrone.Core.Test/DecisionEngineTests/AlreadyImportedSpecificationFixture.cs
@@ -144,7 +144,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             GivenHistoryItem(downloadId, TITLE, _flac, EntityHistoryEventType.DownloadImported);
 
             _remoteAlbum.Release = Builder<TorrentInfo>.CreateNew()
-                                                         .With(t => t.DownloadProtocol = DownloadProtocol.Torrent)
+                                                         .With(t => t.DownloadProtocol = nameof(TorrentDownloadProtocol))
                                                          .With(t => t.InfoHash = downloadId)
                                                          .Build();
 
@@ -160,7 +160,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             GivenHistoryItem(downloadId, TITLE, _flac, EntityHistoryEventType.DownloadImported);
 
             _remoteAlbum.Release = Builder<TorrentInfo>.CreateNew()
-                                                         .With(t => t.DownloadProtocol = DownloadProtocol.Torrent)
+                                                         .With(t => t.DownloadProtocol = nameof(TorrentDownloadProtocol))
                                                          .With(t => t.InfoHash = null)
                                                          .Build();
 
@@ -174,7 +174,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             GivenHistoryItem(null, TITLE, _flac, EntityHistoryEventType.DownloadImported);
 
             _remoteAlbum.Release = Builder<TorrentInfo>.CreateNew()
-                                                         .With(t => t.DownloadProtocol = DownloadProtocol.Torrent)
+                                                         .With(t => t.DownloadProtocol = nameof(TorrentDownloadProtocol))
                                                          .With(t => t.InfoHash = null)
                                                          .Build();
 
@@ -190,7 +190,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             GivenHistoryItem(downloadId, TITLE, _flac, EntityHistoryEventType.DownloadImported);
 
             _remoteAlbum.Release = Builder<TorrentInfo>.CreateNew()
-                                                         .With(t => t.DownloadProtocol = DownloadProtocol.Torrent)
+                                                         .With(t => t.DownloadProtocol = nameof(TorrentDownloadProtocol))
                                                          .With(t => t.InfoHash = downloadId)
                                                          .Build();
 
diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/MinimumAgeSpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/MinimumAgeSpecificationFixture.cs
index 522e0cc85..e4823b28a 100644
--- a/src/NzbDrone.Core.Test/DecisionEngineTests/MinimumAgeSpecificationFixture.cs
+++ b/src/NzbDrone.Core.Test/DecisionEngineTests/MinimumAgeSpecificationFixture.cs
@@ -20,7 +20,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         {
             _remoteAlbum = new RemoteAlbum
             {
-                Release = new ReleaseInfo() { DownloadProtocol = DownloadProtocol.Usenet }
+                Release = new ReleaseInfo() { DownloadProtocol = nameof(UsenetDownloadProtocol) }
             };
         }
 
diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/PrioritizeDownloadDecisionFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/PrioritizeDownloadDecisionFixture.cs
index 7a6b7e479..c9c432b84 100644
--- a/src/NzbDrone.Core.Test/DecisionEngineTests/PrioritizeDownloadDecisionFixture.cs
+++ b/src/NzbDrone.Core.Test/DecisionEngineTests/PrioritizeDownloadDecisionFixture.cs
@@ -24,7 +24,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         [SetUp]
         public void Setup()
         {
-            GivenPreferredDownloadProtocol(DownloadProtocol.Usenet);
+            GivenPreferredDownloadProtocol(nameof(UsenetDownloadProtocol));
 
             Mocker.GetMock<IQualityDefinitionService>()
                 .Setup(s => s.Get(It.IsAny<Quality>()))
@@ -52,7 +52,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
                             .Build();
         }
 
-        private RemoteAlbum GivenRemoteAlbum(List<Album> albums, QualityModel quality, int age = 0, long size = 0, DownloadProtocol downloadProtocol = DownloadProtocol.Usenet, int indexerPriority = 25)
+        private RemoteAlbum GivenRemoteAlbum(List<Album> albums, QualityModel quality, int age = 0, long size = 0, string downloadProtocol = "UsenetDownloadProtocol", int indexerPriority = 25)
         {
             var remoteAlbum = new RemoteAlbum();
             remoteAlbum.ParsedAlbumInfo = new ParsedAlbumInfo();
@@ -78,14 +78,14 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             return remoteAlbum;
         }
 
-        private void GivenPreferredDownloadProtocol(DownloadProtocol downloadProtocol)
+        private void GivenPreferredDownloadProtocol(string downloadProtocol)
         {
+            var profile = new DelayProfile();
+            profile.Items = profile.Items.OrderByDescending(x => x.Protocol == downloadProtocol).ToList();
+
             Mocker.GetMock<IDelayProfileService>()
                   .Setup(s => s.BestForTags(It.IsAny<HashSet<int>>()))
-                  .Returns(new DelayProfile
-                  {
-                      PreferredProtocol = downloadProtocol
-                  });
+                  .Returns(profile);
         }
 
         [Test]
@@ -218,33 +218,33 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         [Test]
         public void should_put_usenet_above_torrent_when_usenet_is_preferred()
         {
-            GivenPreferredDownloadProtocol(DownloadProtocol.Usenet);
+            GivenPreferredDownloadProtocol(nameof(UsenetDownloadProtocol));
 
-            var remoteAlbum1 = GivenRemoteAlbum(new List<Album> { GivenAlbum(1) }, new QualityModel(Quality.MP3_256), downloadProtocol: DownloadProtocol.Torrent);
-            var remoteAlbum2 = GivenRemoteAlbum(new List<Album> { GivenAlbum(1) }, new QualityModel(Quality.MP3_256), downloadProtocol: DownloadProtocol.Usenet);
+            var remoteAlbum1 = GivenRemoteAlbum(new List<Album> { GivenAlbum(1) }, new QualityModel(Quality.MP3_256), downloadProtocol: nameof(TorrentDownloadProtocol));
+            var remoteAlbum2 = GivenRemoteAlbum(new List<Album> { GivenAlbum(1) }, new QualityModel(Quality.MP3_256), downloadProtocol: nameof(UsenetDownloadProtocol));
 
             var decisions = new List<DownloadDecision>();
             decisions.Add(new DownloadDecision(remoteAlbum1));
             decisions.Add(new DownloadDecision(remoteAlbum2));
 
             var qualifiedReports = Subject.PrioritizeDecisions(decisions);
-            qualifiedReports.First().RemoteAlbum.Release.DownloadProtocol.Should().Be(DownloadProtocol.Usenet);
+            qualifiedReports.First().RemoteAlbum.Release.DownloadProtocol.Should().Be(nameof(UsenetDownloadProtocol));
         }
 
         [Test]
         public void should_put_torrent_above_usenet_when_torrent_is_preferred()
         {
-            GivenPreferredDownloadProtocol(DownloadProtocol.Torrent);
+            GivenPreferredDownloadProtocol(nameof(TorrentDownloadProtocol));
 
-            var remoteAlbum1 = GivenRemoteAlbum(new List<Album> { GivenAlbum(1) }, new QualityModel(Quality.MP3_256), downloadProtocol: DownloadProtocol.Torrent);
-            var remoteAlbum2 = GivenRemoteAlbum(new List<Album> { GivenAlbum(1) }, new QualityModel(Quality.MP3_256), downloadProtocol: DownloadProtocol.Usenet);
+            var remoteAlbum1 = GivenRemoteAlbum(new List<Album> { GivenAlbum(1) }, new QualityModel(Quality.MP3_256), downloadProtocol: nameof(TorrentDownloadProtocol));
+            var remoteAlbum2 = GivenRemoteAlbum(new List<Album> { GivenAlbum(1) }, new QualityModel(Quality.MP3_256), downloadProtocol: nameof(UsenetDownloadProtocol));
 
             var decisions = new List<DownloadDecision>();
             decisions.Add(new DownloadDecision(remoteAlbum1));
             decisions.Add(new DownloadDecision(remoteAlbum2));
 
             var qualifiedReports = Subject.PrioritizeDecisions(decisions);
-            qualifiedReports.First().RemoteAlbum.Release.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);
+            qualifiedReports.First().RemoteAlbum.Release.DownloadProtocol.Should().Be(nameof(TorrentDownloadProtocol));
         }
 
         [Test]
@@ -302,7 +302,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             var torrentInfo1 = new TorrentInfo();
             torrentInfo1.PublishDate = DateTime.Now;
             torrentInfo1.Size = 0;
-            torrentInfo1.DownloadProtocol = DownloadProtocol.Torrent;
+            torrentInfo1.DownloadProtocol = nameof(TorrentDownloadProtocol);
             torrentInfo1.Seeders = 10;
 
             var torrentInfo2 = torrentInfo1.JsonClone();
@@ -328,7 +328,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             var torrentInfo1 = new TorrentInfo();
             torrentInfo1.PublishDate = DateTime.Now;
             torrentInfo1.Size = 0;
-            torrentInfo1.DownloadProtocol = DownloadProtocol.Torrent;
+            torrentInfo1.DownloadProtocol = nameof(TorrentDownloadProtocol);
             torrentInfo1.Seeders = 10;
             torrentInfo1.Peers = 10;
 
@@ -355,7 +355,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             var torrentInfo1 = new TorrentInfo();
             torrentInfo1.PublishDate = DateTime.Now;
             torrentInfo1.Size = 0;
-            torrentInfo1.DownloadProtocol = DownloadProtocol.Torrent;
+            torrentInfo1.DownloadProtocol = nameof(TorrentDownloadProtocol);
             torrentInfo1.Seeders = 0;
             torrentInfo1.Peers = 10;
 
@@ -382,7 +382,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
 
             var torrentInfo1 = new TorrentInfo();
             torrentInfo1.PublishDate = DateTime.Now;
-            torrentInfo1.DownloadProtocol = DownloadProtocol.Torrent;
+            torrentInfo1.DownloadProtocol = nameof(TorrentDownloadProtocol);
             torrentInfo1.Seeders = 1000;
             torrentInfo1.Peers = 10;
             torrentInfo1.Size = 200.Megabytes();
@@ -431,7 +431,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
 
             var torrentInfo1 = new TorrentInfo();
             torrentInfo1.PublishDate = DateTime.Now;
-            torrentInfo1.DownloadProtocol = DownloadProtocol.Torrent;
+            torrentInfo1.DownloadProtocol = nameof(TorrentDownloadProtocol);
             torrentInfo1.Seeders = 100;
             torrentInfo1.Peers = 10;
             torrentInfo1.Size = 200.Megabytes();
diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/ProtocolSpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/ProtocolSpecificationFixture.cs
index d30d365a5..4c90c3284 100644
--- a/src/NzbDrone.Core.Test/DecisionEngineTests/ProtocolSpecificationFixture.cs
+++ b/src/NzbDrone.Core.Test/DecisionEngineTests/ProtocolSpecificationFixture.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
@@ -25,13 +26,14 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
             _remoteAlbum.Artist = new Artist();
 
             _delayProfile = new DelayProfile();
+            _delayProfile.Items.ForEach(x => x.Allowed = false);
 
             Mocker.GetMock<IDelayProfileService>()
                   .Setup(s => s.BestForTags(It.IsAny<HashSet<int>>()))
                   .Returns(_delayProfile);
         }
 
-        private void GivenProtocol(DownloadProtocol downloadProtocol)
+        private void GivenProtocol(string downloadProtocol)
         {
             _remoteAlbum.Release.DownloadProtocol = downloadProtocol;
         }
@@ -39,8 +41,8 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         [Test]
         public void should_be_true_if_usenet_and_usenet_is_enabled()
         {
-            GivenProtocol(DownloadProtocol.Usenet);
-            _delayProfile.EnableUsenet = true;
+            GivenProtocol(nameof(UsenetDownloadProtocol));
+            _delayProfile.Items.Single(x => x.Protocol == nameof(UsenetDownloadProtocol)).Allowed = true;
 
             Subject.IsSatisfiedBy(_remoteAlbum, null).Accepted.Should().Be(true);
         }
@@ -48,8 +50,8 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         [Test]
         public void should_be_true_if_torrent_and_torrent_is_enabled()
         {
-            GivenProtocol(DownloadProtocol.Torrent);
-            _delayProfile.EnableTorrent = true;
+            GivenProtocol(nameof(TorrentDownloadProtocol));
+            _delayProfile.Items.Single(x => x.Protocol == nameof(TorrentDownloadProtocol)).Allowed = true;
 
             Subject.IsSatisfiedBy(_remoteAlbum, null).Accepted.Should().Be(true);
         }
@@ -57,8 +59,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         [Test]
         public void should_be_false_if_usenet_and_usenet_is_disabled()
         {
-            GivenProtocol(DownloadProtocol.Usenet);
-            _delayProfile.EnableUsenet = false;
+            GivenProtocol(nameof(UsenetDownloadProtocol));
 
             Subject.IsSatisfiedBy(_remoteAlbum, null).Accepted.Should().Be(false);
         }
@@ -66,8 +67,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         [Test]
         public void should_be_false_if_torrent_and_torrent_is_disabled()
         {
-            GivenProtocol(DownloadProtocol.Torrent);
-            _delayProfile.EnableTorrent = false;
+            GivenProtocol(nameof(TorrentDownloadProtocol));
 
             Subject.IsSatisfiedBy(_remoteAlbum, null).Accepted.Should().Be(false);
         }
diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/RawDiskSpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/RawDiskSpecificationFixture.cs
index aff2e8850..99d3acd35 100644
--- a/src/NzbDrone.Core.Test/DecisionEngineTests/RawDiskSpecificationFixture.cs
+++ b/src/NzbDrone.Core.Test/DecisionEngineTests/RawDiskSpecificationFixture.cs
@@ -18,7 +18,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         {
             _remoteAlbum = new RemoteAlbum
             {
-                Release = new ReleaseInfo() { DownloadProtocol = DownloadProtocol.Torrent }
+                Release = new ReleaseInfo() { DownloadProtocol = nameof(TorrentDownloadProtocol) }
             };
         }
 
diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/RetentionSpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/RetentionSpecificationFixture.cs
index f3ec183f1..1237db03d 100644
--- a/src/NzbDrone.Core.Test/DecisionEngineTests/RetentionSpecificationFixture.cs
+++ b/src/NzbDrone.Core.Test/DecisionEngineTests/RetentionSpecificationFixture.cs
@@ -20,7 +20,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         {
             _remoteAlbum = new RemoteAlbum
             {
-                Release = new ReleaseInfo() { DownloadProtocol = DownloadProtocol.Usenet }
+                Release = new ReleaseInfo() { DownloadProtocol = nameof(UsenetDownloadProtocol) }
             };
         }
 
@@ -82,7 +82,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests
         [Test]
         public void should_return_true_when_release_is_not_usenet()
         {
-            _remoteAlbum.Release.DownloadProtocol = DownloadProtocol.Torrent;
+            _remoteAlbum.Release.DownloadProtocol = nameof(TorrentDownloadProtocol);
 
             WithRetention(10);
             WithAge(100);
diff --git a/src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/DelaySpecificationFixture.cs b/src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/DelaySpecificationFixture.cs
index 7a8639cf6..9a543ecb0 100644
--- a/src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/DelaySpecificationFixture.cs
+++ b/src/NzbDrone.Core.Test/DecisionEngineTests/RssSync/DelaySpecificationFixture.cs
@@ -34,9 +34,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests.RssSync
             _profile = Builder<QualityProfile>.CreateNew()
                                        .Build();
 
-            _delayProfile = Builder<DelayProfile>.CreateNew()
-                                      .With(d => d.PreferredProtocol = DownloadProtocol.Usenet)
-                                      .Build();
+            _delayProfile = new DelayProfile();
 
             var artist = Builder<Artist>.CreateNew()
                                         .With(s => s.QualityProfile = _profile)
@@ -55,7 +53,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests.RssSync
 
             _remoteAlbum.ParsedAlbumInfo = new ParsedAlbumInfo();
             _remoteAlbum.Release = new ReleaseInfo();
-            _remoteAlbum.Release.DownloadProtocol = DownloadProtocol.Usenet;
+            _remoteAlbum.Release.DownloadProtocol = nameof(UsenetDownloadProtocol);
 
             _remoteAlbum.Albums = Builder<Album>.CreateListOfSize(1).Build().ToList();
 
@@ -104,7 +102,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests.RssSync
             _remoteAlbum.ParsedAlbumInfo.Quality = new QualityModel(Quality.MP3_192);
             _remoteAlbum.Release.PublishDate = DateTime.UtcNow;
 
-            _delayProfile.UsenetDelay = 720;
+            _delayProfile.Items[0].Delay = 720;
 
             Subject.IsSatisfiedBy(_remoteAlbum, new AlbumSearchCriteria()).Accepted.Should().BeFalse();
         }
@@ -112,7 +110,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests.RssSync
         [Test]
         public void should_be_true_when_profile_does_not_have_a_delay()
         {
-            _delayProfile.UsenetDelay = 0;
+            _delayProfile.Items[0].Delay = 0;
 
             Subject.IsSatisfiedBy(_remoteAlbum, null).Accepted.Should().BeTrue();
         }
@@ -123,7 +121,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests.RssSync
             _remoteAlbum.Release.PublishDate = DateTime.UtcNow;
             _remoteAlbum.ParsedAlbumInfo.Quality = new QualityModel(Quality.MP3_320);
 
-            _delayProfile.UsenetDelay = 720;
+            _delayProfile.Items[0].Delay = 720;
 
             Subject.IsSatisfiedBy(_remoteAlbum, null).Accepted.Should().BeFalse();
         }
@@ -131,7 +129,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests.RssSync
         [Test]
         public void should_be_true_when_quality_is_last_allowed_in_profile_and_bypass_enabled()
         {
-            _delayProfile.UsenetDelay = 720;
+            _delayProfile.Items[0].Delay = 720;
             _delayProfile.BypassIfHighestQuality = true;
 
             _remoteAlbum.Release.PublishDate = DateTime.UtcNow;
@@ -146,7 +144,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests.RssSync
             _remoteAlbum.ParsedAlbumInfo.Quality = new QualityModel(Quality.MP3_256);
             _remoteAlbum.Release.PublishDate = DateTime.UtcNow.AddHours(-10);
 
-            _delayProfile.UsenetDelay = 60;
+            _delayProfile.Items[0].Delay = 60;
 
             Subject.IsSatisfiedBy(_remoteAlbum, null).Accepted.Should().BeTrue();
         }
@@ -157,7 +155,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests.RssSync
             _remoteAlbum.ParsedAlbumInfo.Quality = new QualityModel(Quality.MP3_192);
             _remoteAlbum.Release.PublishDate = DateTime.UtcNow;
 
-            _delayProfile.UsenetDelay = 720;
+            _delayProfile.Items[0].Delay = 720;
 
             Subject.IsSatisfiedBy(_remoteAlbum, null).Accepted.Should().BeFalse();
         }
@@ -175,7 +173,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests.RssSync
                   .Setup(s => s.IsRevisionUpgrade(It.IsAny<QualityModel>(), It.IsAny<QualityModel>()))
                   .Returns(true);
 
-            _delayProfile.UsenetDelay = 720;
+            _delayProfile.Items[0].Delay = 720;
 
             Subject.IsSatisfiedBy(_remoteAlbum, null).Accepted.Should().BeTrue();
         }
@@ -193,7 +191,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests.RssSync
                   .Setup(s => s.IsRevisionUpgrade(It.IsAny<QualityModel>(), It.IsAny<QualityModel>()))
                   .Returns(true);
 
-            _delayProfile.UsenetDelay = 720;
+            _delayProfile.Items[0].Delay = 720;
 
             Subject.IsSatisfiedBy(_remoteAlbum, null).Accepted.Should().BeTrue();
         }
@@ -206,7 +204,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests.RssSync
 
             GivenExistingFile(new QualityModel(Quality.MP3_256));
 
-            _delayProfile.UsenetDelay = 720;
+            _delayProfile.Items[0].Delay = 720;
 
             Subject.IsSatisfiedBy(_remoteAlbum, null).Accepted.Should().BeFalse();
         }
@@ -217,7 +215,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests.RssSync
             _remoteAlbum.Release.PublishDate = DateTime.UtcNow;
             _remoteAlbum.CustomFormatScore = 100;
 
-            _delayProfile.UsenetDelay = 720;
+            _delayProfile.Items[0].Delay = 720;
             _delayProfile.MinimumCustomFormatScore = 50;
 
             Subject.IsSatisfiedBy(_remoteAlbum, null).Accepted.Should().BeFalse();
@@ -229,7 +227,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests.RssSync
             _remoteAlbum.Release.PublishDate = DateTime.UtcNow;
             _remoteAlbum.CustomFormatScore = 5;
 
-            _delayProfile.UsenetDelay = 720;
+            _delayProfile.Items[0].Delay = 720;
             _delayProfile.BypassIfAboveCustomFormatScore = true;
             _delayProfile.MinimumCustomFormatScore = 50;
 
@@ -242,7 +240,7 @@ namespace NzbDrone.Core.Test.DecisionEngineTests.RssSync
             _remoteAlbum.Release.PublishDate = DateTime.UtcNow;
             _remoteAlbum.CustomFormatScore = 100;
 
-            _delayProfile.UsenetDelay = 720;
+            _delayProfile.Items[0].Delay = 720;
             _delayProfile.BypassIfAboveCustomFormatScore = true;
             _delayProfile.MinimumCustomFormatScore = 50;
 
diff --git a/src/NzbDrone.Core.Test/Download/DownloadApprovedReportsTests/DownloadApprovedFixture.cs b/src/NzbDrone.Core.Test/Download/DownloadApprovedReportsTests/DownloadApprovedFixture.cs
index 569c9b0c9..e540df58c 100644
--- a/src/NzbDrone.Core.Test/Download/DownloadApprovedReportsTests/DownloadApprovedFixture.cs
+++ b/src/NzbDrone.Core.Test/Download/DownloadApprovedReportsTests/DownloadApprovedFixture.cs
@@ -38,7 +38,7 @@ namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests
                             .Build();
         }
 
-        private RemoteAlbum GetRemoteAlbum(List<Album> albums, QualityModel quality, DownloadProtocol downloadProtocol = DownloadProtocol.Usenet)
+        private RemoteAlbum GetRemoteAlbum(List<Album> albums, QualityModel quality, string downloadProtocol = "UsenetDownloadProtocol")
         {
             var remoteAlbum = new RemoteAlbum();
             remoteAlbum.ParsedAlbumInfo = new ParsedAlbumInfo();
@@ -253,19 +253,19 @@ namespace NzbDrone.Core.Test.Download.DownloadApprovedReportsTests
         public async Task should_not_add_to_failed_if_failed_for_a_different_protocol()
         {
             var albums = new List<Album> { GetAlbum(1) };
-            var remoteAlbum = GetRemoteAlbum(albums, new QualityModel(Quality.MP3_320), DownloadProtocol.Usenet);
-            var remoteAlbum2 = GetRemoteAlbum(albums, new QualityModel(Quality.MP3_320), DownloadProtocol.Torrent);
+            var remoteAlbum = GetRemoteAlbum(albums, new QualityModel(Quality.MP3_320), nameof(UsenetDownloadProtocol));
+            var remoteAlbum2 = GetRemoteAlbum(albums, new QualityModel(Quality.MP3_320), nameof(TorrentDownloadProtocol));
 
             var decisions = new List<DownloadDecision>();
             decisions.Add(new DownloadDecision(remoteAlbum));
             decisions.Add(new DownloadDecision(remoteAlbum2));
 
-            Mocker.GetMock<IDownloadService>().Setup(s => s.DownloadReport(It.Is<RemoteAlbum>(r => r.Release.DownloadProtocol == DownloadProtocol.Usenet), null))
+            Mocker.GetMock<IDownloadService>().Setup(s => s.DownloadReport(It.Is<RemoteAlbum>(r => r.Release.DownloadProtocol == nameof(UsenetDownloadProtocol)), null))
                   .Throws(new DownloadClientUnavailableException("Download client failed"));
 
             await Subject.ProcessDecisions(decisions);
-            Mocker.GetMock<IDownloadService>().Verify(v => v.DownloadReport(It.Is<RemoteAlbum>(r => r.Release.DownloadProtocol == DownloadProtocol.Usenet), null), Times.Once());
-            Mocker.GetMock<IDownloadService>().Verify(v => v.DownloadReport(It.Is<RemoteAlbum>(r => r.Release.DownloadProtocol == DownloadProtocol.Torrent), null), Times.Once());
+            Mocker.GetMock<IDownloadService>().Verify(v => v.DownloadReport(It.Is<RemoteAlbum>(r => r.Release.DownloadProtocol == nameof(UsenetDownloadProtocol)), null), Times.Once());
+            Mocker.GetMock<IDownloadService>().Verify(v => v.DownloadReport(It.Is<RemoteAlbum>(r => r.Release.DownloadProtocol == nameof(TorrentDownloadProtocol)), null), Times.Once());
         }
 
         [Test]
diff --git a/src/NzbDrone.Core.Test/Download/DownloadClientProviderFixture.cs b/src/NzbDrone.Core.Test/Download/DownloadClientProviderFixture.cs
index 6476f4483..2e8dfa393 100644
--- a/src/NzbDrone.Core.Test/Download/DownloadClientProviderFixture.cs
+++ b/src/NzbDrone.Core.Test/Download/DownloadClientProviderFixture.cs
@@ -47,7 +47,7 @@ namespace NzbDrone.Core.Test.Download
 
             _downloadClients.Add(mock.Object);
 
-            mock.SetupGet(v => v.Protocol).Returns(DownloadProtocol.Usenet);
+            mock.SetupGet(v => v.Protocol).Returns(nameof(UsenetDownloadProtocol));
 
             return mock;
         }
@@ -65,7 +65,7 @@ namespace NzbDrone.Core.Test.Download
 
             _downloadClients.Add(mock.Object);
 
-            mock.SetupGet(v => v.Protocol).Returns(DownloadProtocol.Torrent);
+            mock.SetupGet(v => v.Protocol).Returns(nameof(TorrentDownloadProtocol));
 
             return mock;
         }
@@ -98,11 +98,11 @@ namespace NzbDrone.Core.Test.Download
             WithUsenetClient();
             WithTorrentClient();
 
-            var client1 = Subject.GetDownloadClient(DownloadProtocol.Usenet);
-            var client2 = Subject.GetDownloadClient(DownloadProtocol.Usenet);
-            var client3 = Subject.GetDownloadClient(DownloadProtocol.Usenet);
-            var client4 = Subject.GetDownloadClient(DownloadProtocol.Usenet);
-            var client5 = Subject.GetDownloadClient(DownloadProtocol.Usenet);
+            var client1 = Subject.GetDownloadClient(nameof(UsenetDownloadProtocol));
+            var client2 = Subject.GetDownloadClient(nameof(UsenetDownloadProtocol));
+            var client3 = Subject.GetDownloadClient(nameof(UsenetDownloadProtocol));
+            var client4 = Subject.GetDownloadClient(nameof(UsenetDownloadProtocol));
+            var client5 = Subject.GetDownloadClient(nameof(UsenetDownloadProtocol));
 
             client1.Definition.Id.Should().Be(1);
             client2.Definition.Id.Should().Be(2);
@@ -119,11 +119,11 @@ namespace NzbDrone.Core.Test.Download
             WithTorrentClient();
             WithTorrentClient();
 
-            var client1 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client2 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client3 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client4 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client5 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
+            var client1 = Subject.GetDownloadClient(nameof(TorrentDownloadProtocol));
+            var client2 = Subject.GetDownloadClient(nameof(TorrentDownloadProtocol));
+            var client3 = Subject.GetDownloadClient(nameof(TorrentDownloadProtocol));
+            var client4 = Subject.GetDownloadClient(nameof(TorrentDownloadProtocol));
+            var client5 = Subject.GetDownloadClient(nameof(TorrentDownloadProtocol));
 
             client1.Definition.Id.Should().Be(2);
             client2.Definition.Id.Should().Be(3);
@@ -139,10 +139,10 @@ namespace NzbDrone.Core.Test.Download
             WithTorrentClient();
             WithTorrentClient();
 
-            var client1 = Subject.GetDownloadClient(DownloadProtocol.Usenet);
-            var client2 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client3 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client4 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
+            var client1 = Subject.GetDownloadClient(nameof(UsenetDownloadProtocol));
+            var client2 = Subject.GetDownloadClient(nameof(TorrentDownloadProtocol));
+            var client3 = Subject.GetDownloadClient(nameof(TorrentDownloadProtocol));
+            var client4 = Subject.GetDownloadClient(nameof(TorrentDownloadProtocol));
 
             client1.Definition.Id.Should().Be(1);
             client2.Definition.Id.Should().Be(2);
@@ -161,10 +161,10 @@ namespace NzbDrone.Core.Test.Download
             WithTorrentClient();
             WithTorrentClient(0, clientTags);
 
-            var client1 = Subject.GetDownloadClient(DownloadProtocol.Torrent, 0, false, seriesTags);
-            var client2 = Subject.GetDownloadClient(DownloadProtocol.Torrent, 0, false, seriesTags);
-            var client3 = Subject.GetDownloadClient(DownloadProtocol.Torrent, 0, false, seriesTags);
-            var client4 = Subject.GetDownloadClient(DownloadProtocol.Torrent, 0, false, seriesTags);
+            var client1 = Subject.GetDownloadClient(nameof(TorrentDownloadProtocol), 0, false, seriesTags);
+            var client2 = Subject.GetDownloadClient(nameof(TorrentDownloadProtocol), 0, false, seriesTags);
+            var client3 = Subject.GetDownloadClient(nameof(TorrentDownloadProtocol), 0, false, seriesTags);
+            var client4 = Subject.GetDownloadClient(nameof(TorrentDownloadProtocol), 0, false, seriesTags);
 
             client1.Definition.Id.Should().Be(2);
             client2.Definition.Id.Should().Be(4);
@@ -183,10 +183,10 @@ namespace NzbDrone.Core.Test.Download
             WithTorrentClient();
             WithTorrentClient(0, clientTags);
 
-            var client1 = Subject.GetDownloadClient(DownloadProtocol.Torrent, 0, false, seriesTags);
-            var client2 = Subject.GetDownloadClient(DownloadProtocol.Torrent, 0, false, seriesTags);
-            var client3 = Subject.GetDownloadClient(DownloadProtocol.Torrent, 0, false, seriesTags);
-            var client4 = Subject.GetDownloadClient(DownloadProtocol.Torrent, 0, false, seriesTags);
+            var client1 = Subject.GetDownloadClient(nameof(TorrentDownloadProtocol), 0, false, seriesTags);
+            var client2 = Subject.GetDownloadClient(nameof(TorrentDownloadProtocol), 0, false, seriesTags);
+            var client3 = Subject.GetDownloadClient(nameof(TorrentDownloadProtocol), 0, false, seriesTags);
+            var client4 = Subject.GetDownloadClient(nameof(TorrentDownloadProtocol), 0, false, seriesTags);
 
             client1.Definition.Id.Should().Be(1);
             client2.Definition.Id.Should().Be(3);
@@ -202,7 +202,7 @@ namespace NzbDrone.Core.Test.Download
 
             WithTorrentClient(0, clientTags);
 
-            Assert.Throws<DownloadClientUnavailableException>(() => Subject.GetDownloadClient(DownloadProtocol.Torrent, 0, false, seriesTags));
+            Assert.Throws<DownloadClientUnavailableException>(() => Subject.GetDownloadClient(nameof(TorrentDownloadProtocol), 0, false, seriesTags));
         }
 
         [Test]
@@ -215,10 +215,10 @@ namespace NzbDrone.Core.Test.Download
 
             GivenBlockedClient(3);
 
-            var client1 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client2 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client3 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client4 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
+            var client1 = Subject.GetDownloadClient(nameof(TorrentDownloadProtocol));
+            var client2 = Subject.GetDownloadClient(nameof(TorrentDownloadProtocol));
+            var client3 = Subject.GetDownloadClient(nameof(TorrentDownloadProtocol));
+            var client4 = Subject.GetDownloadClient(nameof(TorrentDownloadProtocol));
 
             client1.Definition.Id.Should().Be(2);
             client2.Definition.Id.Should().Be(4);
@@ -238,11 +238,11 @@ namespace NzbDrone.Core.Test.Download
             GivenBlockedClient(3);
             GivenBlockedClient(4);
 
-            var client1 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client2 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client3 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client4 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client5 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
+            var client1 = Subject.GetDownloadClient(nameof(TorrentDownloadProtocol));
+            var client2 = Subject.GetDownloadClient(nameof(TorrentDownloadProtocol));
+            var client3 = Subject.GetDownloadClient(nameof(TorrentDownloadProtocol));
+            var client4 = Subject.GetDownloadClient(nameof(TorrentDownloadProtocol));
+            var client5 = Subject.GetDownloadClient(nameof(TorrentDownloadProtocol));
 
             client1.Definition.Id.Should().Be(2);
             client2.Definition.Id.Should().Be(3);
@@ -258,11 +258,11 @@ namespace NzbDrone.Core.Test.Download
             WithTorrentClient();
             WithTorrentClient();
 
-            var client1 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client2 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client3 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client4 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client5 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
+            var client1 = Subject.GetDownloadClient(nameof(TorrentDownloadProtocol));
+            var client2 = Subject.GetDownloadClient(nameof(TorrentDownloadProtocol));
+            var client3 = Subject.GetDownloadClient(nameof(TorrentDownloadProtocol));
+            var client4 = Subject.GetDownloadClient(nameof(TorrentDownloadProtocol));
+            var client5 = Subject.GetDownloadClient(nameof(TorrentDownloadProtocol));
 
             client1.Definition.Id.Should().Be(3);
             client2.Definition.Id.Should().Be(4);
@@ -280,11 +280,11 @@ namespace NzbDrone.Core.Test.Download
 
             GivenBlockedClient(4);
 
-            var client1 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client2 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client3 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client4 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
-            var client5 = Subject.GetDownloadClient(DownloadProtocol.Torrent);
+            var client1 = Subject.GetDownloadClient(nameof(TorrentDownloadProtocol));
+            var client2 = Subject.GetDownloadClient(nameof(TorrentDownloadProtocol));
+            var client3 = Subject.GetDownloadClient(nameof(TorrentDownloadProtocol));
+            var client4 = Subject.GetDownloadClient(nameof(TorrentDownloadProtocol));
+            var client5 = Subject.GetDownloadClient(nameof(TorrentDownloadProtocol));
 
             client1.Definition.Id.Should().Be(2);
             client2.Definition.Id.Should().Be(3);
@@ -301,11 +301,11 @@ namespace NzbDrone.Core.Test.Download
             WithTorrentClient();
             WithTorrentIndexer(3);
 
-            var client1 = Subject.GetDownloadClient(DownloadProtocol.Torrent, 1);
-            var client2 = Subject.GetDownloadClient(DownloadProtocol.Torrent, 1);
-            var client3 = Subject.GetDownloadClient(DownloadProtocol.Torrent, 1);
-            var client4 = Subject.GetDownloadClient(DownloadProtocol.Torrent, 1);
-            var client5 = Subject.GetDownloadClient(DownloadProtocol.Torrent, 1);
+            var client1 = Subject.GetDownloadClient(nameof(TorrentDownloadProtocol), 1);
+            var client2 = Subject.GetDownloadClient(nameof(TorrentDownloadProtocol), 1);
+            var client3 = Subject.GetDownloadClient(nameof(TorrentDownloadProtocol), 1);
+            var client4 = Subject.GetDownloadClient(nameof(TorrentDownloadProtocol), 1);
+            var client5 = Subject.GetDownloadClient(nameof(TorrentDownloadProtocol), 1);
 
             client1.Definition.Id.Should().Be(3);
             client2.Definition.Id.Should().Be(3);
@@ -323,7 +323,7 @@ namespace NzbDrone.Core.Test.Download
             WithTorrentClient();
             WithTorrentIndexer(5);
 
-            Assert.Throws<DownloadClientUnavailableException>(() => Subject.GetDownloadClient(DownloadProtocol.Torrent, 1));
+            Assert.Throws<DownloadClientUnavailableException>(() => Subject.GetDownloadClient(nameof(TorrentDownloadProtocol), 1));
         }
     }
 }
diff --git a/src/NzbDrone.Core.Test/Download/DownloadServiceFixture.cs b/src/NzbDrone.Core.Test/Download/DownloadServiceFixture.cs
index 132ffc7df..736f3b074 100644
--- a/src/NzbDrone.Core.Test/Download/DownloadServiceFixture.cs
+++ b/src/NzbDrone.Core.Test/Download/DownloadServiceFixture.cs
@@ -32,8 +32,8 @@ namespace NzbDrone.Core.Test.Download
                 .Returns(_downloadClients);
 
             Mocker.GetMock<IProvideDownloadClient>()
-                .Setup(v => v.GetDownloadClient(It.IsAny<DownloadProtocol>(), It.IsAny<int>(), It.IsAny<bool>(), It.IsAny<HashSet<int>>()))
-                .Returns<DownloadProtocol, int, bool, HashSet<int>>((v, i, f, t) => _downloadClients.FirstOrDefault(d => d.Protocol == v));
+                .Setup(v => v.GetDownloadClient(It.IsAny<string>(), It.IsAny<int>(), It.IsAny<bool>(), It.IsAny<HashSet<int>>()))
+                .Returns<string, int, bool, HashSet<int>>((v, i, f, t) => _downloadClients.FirstOrDefault(d => d.Protocol == v));
 
             var episodes = Builder<Album>.CreateListOfSize(2)
                 .TheFirst(1).With(s => s.Id = 12)
@@ -42,7 +42,7 @@ namespace NzbDrone.Core.Test.Download
                 .Build().ToList();
 
             var releaseInfo = Builder<ReleaseInfo>.CreateNew()
-                .With(v => v.DownloadProtocol = DownloadProtocol.Usenet)
+                .With(v => v.DownloadProtocol = nameof(UsenetDownloadProtocol))
                 .With(v => v.DownloadUrl = "http://test.site/download1.ext")
                 .Build();
 
@@ -60,7 +60,7 @@ namespace NzbDrone.Core.Test.Download
 
             _downloadClients.Add(mock.Object);
 
-            mock.SetupGet(v => v.Protocol).Returns(DownloadProtocol.Usenet);
+            mock.SetupGet(v => v.Protocol).Returns(nameof(UsenetDownloadProtocol));
 
             return mock;
         }
@@ -72,7 +72,7 @@ namespace NzbDrone.Core.Test.Download
 
             _downloadClients.Add(mock.Object);
 
-            mock.SetupGet(v => v.Protocol).Returns(DownloadProtocol.Torrent);
+            mock.SetupGet(v => v.Protocol).Returns(nameof(TorrentDownloadProtocol));
 
             return mock;
         }
@@ -247,7 +247,7 @@ namespace NzbDrone.Core.Test.Download
             var mockTorrent = WithTorrentClient();
             var mockUsenet = WithUsenetClient();
 
-            _parseResult.Release.DownloadProtocol = DownloadProtocol.Torrent;
+            _parseResult.Release.DownloadProtocol = nameof(TorrentDownloadProtocol);
 
             await Subject.DownloadReport(_parseResult, null);
 
diff --git a/src/NzbDrone.Core.Test/Download/TrackedDownloads/TrackedDownloadServiceFixture.cs b/src/NzbDrone.Core.Test/Download/TrackedDownloads/TrackedDownloadServiceFixture.cs
index 81ff483a0..925712d57 100644
--- a/src/NzbDrone.Core.Test/Download/TrackedDownloads/TrackedDownloadServiceFixture.cs
+++ b/src/NzbDrone.Core.Test/Download/TrackedDownloads/TrackedDownloadServiceFixture.cs
@@ -57,7 +57,7 @@ namespace NzbDrone.Core.Test.Download.TrackedDownloads
             var client = new DownloadClientDefinition()
             {
                 Id = 1,
-                Protocol = DownloadProtocol.Torrent
+                Protocol = nameof(TorrentDownloadProtocol)
             };
 
             var item = new DownloadClientItem()
@@ -104,7 +104,7 @@ namespace NzbDrone.Core.Test.Download.TrackedDownloads
             var client = new DownloadClientDefinition()
             {
                 Id = 1,
-                Protocol = DownloadProtocol.Torrent
+                Protocol = nameof(TorrentDownloadProtocol)
             };
 
             var item = new DownloadClientItem()
@@ -160,7 +160,7 @@ namespace NzbDrone.Core.Test.Download.TrackedDownloads
             var client = new DownloadClientDefinition()
             {
                 Id = 1,
-                Protocol = DownloadProtocol.Torrent
+                Protocol = nameof(TorrentDownloadProtocol)
             };
 
             var item = new DownloadClientItem()
@@ -213,7 +213,7 @@ namespace NzbDrone.Core.Test.Download.TrackedDownloads
             var client = new DownloadClientDefinition()
             {
                 Id = 1,
-                Protocol = DownloadProtocol.Torrent
+                Protocol = nameof(TorrentDownloadProtocol)
             };
 
             var item = new DownloadClientItem()
@@ -266,7 +266,7 @@ namespace NzbDrone.Core.Test.Download.TrackedDownloads
             var client = new DownloadClientDefinition()
             {
                 Id = 1,
-                Protocol = DownloadProtocol.Torrent
+                Protocol = nameof(TorrentDownloadProtocol)
             };
 
             var item = new DownloadClientItem()
diff --git a/src/NzbDrone.Core.Test/HealthCheck/Checks/RemotePathMappingCheckFixture.cs b/src/NzbDrone.Core.Test/HealthCheck/Checks/RemotePathMappingCheckFixture.cs
index 54bf6b679..cb8161084 100644
--- a/src/NzbDrone.Core.Test/HealthCheck/Checks/RemotePathMappingCheckFixture.cs
+++ b/src/NzbDrone.Core.Test/HealthCheck/Checks/RemotePathMappingCheckFixture.cs
@@ -10,6 +10,7 @@ using NzbDrone.Core.Configuration;
 using NzbDrone.Core.Download;
 using NzbDrone.Core.Download.Clients;
 using NzbDrone.Core.HealthCheck.Checks;
+using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Localization;
 using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.MediaFiles.Events;
@@ -41,7 +42,12 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks
         {
             _downloadItem = new DownloadClientItem
             {
-                DownloadClientInfo = new DownloadClientItemClientInfo { Name = "Test" },
+                DownloadClientInfo = new DownloadClientItemClientInfo
+                {
+                    Protocol = nameof(UsenetDownloadProtocol),
+                    Id = 1,
+                    Name = "Test"
+                },
                 DownloadId = "TestId",
                 OutputPath = new OsPath(_downloadItemPath)
             };
diff --git a/src/NzbDrone.Core.Test/HistoryTests/HistoryServiceFixture.cs b/src/NzbDrone.Core.Test/HistoryTests/HistoryServiceFixture.cs
index 22e8388cf..078d68834 100644
--- a/src/NzbDrone.Core.Test/HistoryTests/HistoryServiceFixture.cs
+++ b/src/NzbDrone.Core.Test/HistoryTests/HistoryServiceFixture.cs
@@ -61,7 +61,7 @@ namespace NzbDrone.Core.Test.HistoryTests
             {
                 DownloadClientInfo = new DownloadClientItemClientInfo
                 {
-                    Protocol = DownloadProtocol.Usenet,
+                    Protocol = nameof(UsenetDownloadProtocol),
                     Id = 1,
                     Name = "sab"
                 },
diff --git a/src/NzbDrone.Core.Test/IndexerTests/FileListTests/FileListFixture.cs b/src/NzbDrone.Core.Test/IndexerTests/FileListTests/FileListFixture.cs
index 91128bd1a..d821366d1 100644
--- a/src/NzbDrone.Core.Test/IndexerTests/FileListTests/FileListFixture.cs
+++ b/src/NzbDrone.Core.Test/IndexerTests/FileListTests/FileListFixture.cs
@@ -43,7 +43,7 @@ namespace NzbDrone.Core.Test.IndexerTests.FileListTests
             var torrentInfo = releases.First() as TorrentInfo;
 
             torrentInfo.Title.Should().Be("Mankind.Divided.2019.S01E01.1080p.WEB-DL");
-            torrentInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);
+            torrentInfo.DownloadProtocol.Should().Be(nameof(TorrentDownloadProtocol));
             torrentInfo.DownloadUrl.Should().Be("https://filelist.io/download.php?id=1234&passkey=somepass");
             torrentInfo.InfoUrl.Should().Be("https://filelist.io/details.php?id=1234");
             torrentInfo.CommentUrl.Should().BeNullOrEmpty();
diff --git a/src/NzbDrone.Core.Test/IndexerTests/GazelleTests/GazelleFixture.cs b/src/NzbDrone.Core.Test/IndexerTests/GazelleTests/GazelleFixture.cs
index 018590181..c8985eac6 100644
--- a/src/NzbDrone.Core.Test/IndexerTests/GazelleTests/GazelleFixture.cs
+++ b/src/NzbDrone.Core.Test/IndexerTests/GazelleTests/GazelleFixture.cs
@@ -55,7 +55,7 @@ namespace NzbDrone.Core.Test.IndexerTests.GazelleTests
             var releaseInfo = releases.First();
 
             releaseInfo.Title.Should().Be("Shania Twain - Shania Twain (1993) [FLAC 24bit Lossless] [WEB]");
-            releaseInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);
+            releaseInfo.DownloadProtocol.Should().Be(nameof(TorrentDownloadProtocol));
             releaseInfo.DownloadUrl.Should()
                 .Be("http://someurl.ch/torrents.php?action=download&id=1541452&authkey=redacted&torrent_pass=redacted");
             releaseInfo.InfoUrl.Should().Be("http://someurl.ch/torrents.php?id=106951&torrentid=1541452");
diff --git a/src/NzbDrone.Core.Test/IndexerTests/HeadphonesTests/HeadphonesFixture.cs b/src/NzbDrone.Core.Test/IndexerTests/HeadphonesTests/HeadphonesFixture.cs
index 08d7b44b1..d6d88ad4f 100644
--- a/src/NzbDrone.Core.Test/IndexerTests/HeadphonesTests/HeadphonesFixture.cs
+++ b/src/NzbDrone.Core.Test/IndexerTests/HeadphonesTests/HeadphonesFixture.cs
@@ -55,7 +55,7 @@ namespace NzbDrone.Core.Test.IndexerTests.HeadphonesTests
             var releaseInfo = releases.First();
 
             releaseInfo.Title.Should().Be("Lady Gaga Born This Way 2CD FLAC 2011 WRE");
-            releaseInfo.DownloadProtocol.Should().Be(DownloadProtocol.Usenet);
+            releaseInfo.DownloadProtocol.Should().Be(nameof(UsenetDownloadProtocol));
             releaseInfo.DownloadUrl.Should().Be("https://indexer.codeshy.com/api?t=g&guid=123456&apikey=123456789");
             releaseInfo.Indexer.Should().Be(Subject.Definition.Name);
             releaseInfo.PublishDate.Should().Be(DateTime.Parse("2013/06/02 08:58:54"));
diff --git a/src/NzbDrone.Core.Test/IndexerTests/IPTorrentsTests/IPTorrentsFixture.cs b/src/NzbDrone.Core.Test/IndexerTests/IPTorrentsTests/IPTorrentsFixture.cs
index 890acf429..6000e6655 100644
--- a/src/NzbDrone.Core.Test/IndexerTests/IPTorrentsTests/IPTorrentsFixture.cs
+++ b/src/NzbDrone.Core.Test/IndexerTests/IPTorrentsTests/IPTorrentsFixture.cs
@@ -101,7 +101,7 @@ namespace NzbDrone.Core.Test.IndexerTests.IPTorrentsTests
             var torrentInfo = releases.First() as TorrentInfo;
 
             torrentInfo.Title.Should().Be("24 S03E12 720p WEBRip h264-DRAWER");
-            torrentInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);
+            torrentInfo.DownloadProtocol.Should().Be(nameof(TorrentDownloadProtocol));
             torrentInfo.DownloadUrl.Should().Be("http://iptorrents.com/download.php/1234/24.S03E12.720p.WEBRip.h264-DRAWER.torrent?torrent_pass=abcd");
             torrentInfo.InfoUrl.Should().BeNullOrEmpty();
             torrentInfo.CommentUrl.Should().BeNullOrEmpty();
diff --git a/src/NzbDrone.Core.Test/IndexerTests/IntegrationTests/IndexerIntegrationTests.cs b/src/NzbDrone.Core.Test/IndexerTests/IntegrationTests/IndexerIntegrationTests.cs
index a8cf68024..28a29c474 100644
--- a/src/NzbDrone.Core.Test/IndexerTests/IntegrationTests/IndexerIntegrationTests.cs
+++ b/src/NzbDrone.Core.Test/IndexerTests/IntegrationTests/IndexerIntegrationTests.cs
@@ -32,7 +32,7 @@ namespace NzbDrone.Core.Test.IndexerTests.IntegrationTests
 
             ValidateResult(reports, hasSize, hasInfoUrl);
 
-            reports.Should().OnlyContain(c => c.DownloadProtocol == DownloadProtocol.Torrent);
+            reports.Should().OnlyContain(c => c.DownloadProtocol == nameof(TorrentDownloadProtocol));
 
             if (hasMagnet)
             {
diff --git a/src/NzbDrone.Core.Test/IndexerTests/NewznabTests/NewznabFixture.cs b/src/NzbDrone.Core.Test/IndexerTests/NewznabTests/NewznabFixture.cs
index f5755c454..4fafcf40a 100644
--- a/src/NzbDrone.Core.Test/IndexerTests/NewznabTests/NewznabFixture.cs
+++ b/src/NzbDrone.Core.Test/IndexerTests/NewznabTests/NewznabFixture.cs
@@ -56,7 +56,7 @@ namespace NzbDrone.Core.Test.IndexerTests.NewznabTests
             var releaseInfo = releases.First();
 
             releaseInfo.Title.Should().Be("Brainstorm-Scary Creatures-CD-FLAC-2016-NBFLAC");
-            releaseInfo.DownloadProtocol.Should().Be(DownloadProtocol.Usenet);
+            releaseInfo.DownloadProtocol.Should().Be(nameof(UsenetDownloadProtocol));
             releaseInfo.DownloadUrl.Should().Be("http://api.nzbgeek.info/api?t=get&id=38884827e1e56b9336278a449e0a38ec&apikey=xxx");
             releaseInfo.InfoUrl.Should().Be("https://nzbgeek.info/geekseek.php?guid=38884827e1e56b9336278a449e0a38ec");
             releaseInfo.CommentUrl.Should().Be("https://nzbgeek.info/geekseek.php?guid=38884827e1e56b9336278a449e0a38ec");
diff --git a/src/NzbDrone.Core.Test/IndexerTests/NyaaTests/NyaaFixture.cs b/src/NzbDrone.Core.Test/IndexerTests/NyaaTests/NyaaFixture.cs
index 5f42b5012..5052f7972 100644
--- a/src/NzbDrone.Core.Test/IndexerTests/NyaaTests/NyaaFixture.cs
+++ b/src/NzbDrone.Core.Test/IndexerTests/NyaaTests/NyaaFixture.cs
@@ -45,7 +45,7 @@ namespace NzbDrone.Core.Test.IndexerTests.NyaaTests
             var torrentInfo = releases.First() as TorrentInfo;
 
             torrentInfo.Title.Should().Be("[TSRaws] Futsuu no Joshikousei ga [Locodol] Yattemita. #07 (TBS).ts");
-            torrentInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);
+            torrentInfo.DownloadProtocol.Should().Be(nameof(TorrentDownloadProtocol));
             torrentInfo.DownloadUrl.Should().Be("https://www.nyaa.se/?page=download&tid=587750");
             torrentInfo.InfoUrl.Should().Be("https://www.nyaa.se/?page=view&tid=587750");
             torrentInfo.CommentUrl.Should().BeNullOrEmpty();
@@ -75,7 +75,7 @@ namespace NzbDrone.Core.Test.IndexerTests.NyaaTests
             var torrentInfo = releases.First() as TorrentInfo;
 
             torrentInfo.Title.Should().Be("[Foxy-Subs] Mahouka Koukou no Yuutousei - 08 [720p] [3194D881].mkv");
-            torrentInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);
+            torrentInfo.DownloadProtocol.Should().Be(nameof(TorrentDownloadProtocol));
             torrentInfo.DownloadUrl.Should().Be("https://nyaa.si/download/1424896.torrent");
             torrentInfo.InfoUrl.Should().Be("https://nyaa.si/view/1424896");
             torrentInfo.CommentUrl.Should().BeNullOrEmpty();
diff --git a/src/NzbDrone.Core.Test/IndexerTests/RedactedTests/RedactedFixture.cs b/src/NzbDrone.Core.Test/IndexerTests/RedactedTests/RedactedFixture.cs
index f08bc8b1b..13a67be4b 100644
--- a/src/NzbDrone.Core.Test/IndexerTests/RedactedTests/RedactedFixture.cs
+++ b/src/NzbDrone.Core.Test/IndexerTests/RedactedTests/RedactedFixture.cs
@@ -46,7 +46,7 @@ namespace NzbDrone.Core.Test.IndexerTests.RedactedTests
             var releaseInfo = releases.First();
 
             releaseInfo.Title.Should().Be("Shania Twain - Shania Twain (1993) [Album] [FLAC 24bit Lossless / WEB]");
-            releaseInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);
+            releaseInfo.DownloadProtocol.Should().Be(nameof(TorrentDownloadProtocol));
             releaseInfo.DownloadUrl.Should().Be("https://redacted.ch/ajax.php?action=download&id=1541452");
             releaseInfo.InfoUrl.Should().Be("https://redacted.ch/torrents.php?id=106951&torrentid=1541452");
             releaseInfo.CommentUrl.Should().Be(null);
diff --git a/src/NzbDrone.Core.Test/IndexerTests/SeedConfigProviderFixture.cs b/src/NzbDrone.Core.Test/IndexerTests/SeedConfigProviderFixture.cs
index 53a054868..075df0c13 100644
--- a/src/NzbDrone.Core.Test/IndexerTests/SeedConfigProviderFixture.cs
+++ b/src/NzbDrone.Core.Test/IndexerTests/SeedConfigProviderFixture.cs
@@ -24,7 +24,7 @@ namespace NzbDrone.Core.Test.IndexerTests
             {
                 Release = new ReleaseInfo
                 {
-                    DownloadProtocol = DownloadProtocol.Torrent,
+                    DownloadProtocol = nameof(TorrentDownloadProtocol),
                     IndexerId = 0
                 }
             });
@@ -49,7 +49,7 @@ namespace NzbDrone.Core.Test.IndexerTests
             {
                 Release = new ReleaseInfo()
                 {
-                    DownloadProtocol = DownloadProtocol.Torrent,
+                    DownloadProtocol = nameof(TorrentDownloadProtocol),
                     IndexerId = 1
                 },
                 ParsedAlbumInfo = new ParsedAlbumInfo
diff --git a/src/NzbDrone.Core.Test/IndexerTests/TestIndexer.cs b/src/NzbDrone.Core.Test/IndexerTests/TestIndexer.cs
index 2b73b3b73..c72b32967 100644
--- a/src/NzbDrone.Core.Test/IndexerTests/TestIndexer.cs
+++ b/src/NzbDrone.Core.Test/IndexerTests/TestIndexer.cs
@@ -10,7 +10,7 @@ namespace NzbDrone.Core.Test.IndexerTests
     {
         public override string Name => "Test Indexer";
 
-        public override DownloadProtocol Protocol => DownloadProtocol.Usenet;
+        public override string Protocol => nameof(UsenetDownloadProtocol);
 
         public int _supportedPageSize;
         public override int PageSize => _supportedPageSize;
diff --git a/src/NzbDrone.Core.Test/IndexerTests/TorrentRssIndexerTests/TorrentRssIndexerFixture.cs b/src/NzbDrone.Core.Test/IndexerTests/TorrentRssIndexerTests/TorrentRssIndexerFixture.cs
index e25421379..706575ce8 100644
--- a/src/NzbDrone.Core.Test/IndexerTests/TorrentRssIndexerTests/TorrentRssIndexerFixture.cs
+++ b/src/NzbDrone.Core.Test/IndexerTests/TorrentRssIndexerTests/TorrentRssIndexerFixture.cs
@@ -57,7 +57,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests
             var torrentInfo = (TorrentInfo)releases.First();
 
             torrentInfo.Title.Should().Be("Conan.2015.02.05.Jeff.Bridges.720p.HDTV.X264-CROOKS");
-            torrentInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);
+            torrentInfo.DownloadProtocol.Should().Be(nameof(TorrentDownloadProtocol));
             torrentInfo.DownloadUrl.Should().Be("https://immortalseed.me/download.php?type=rss&secret_key=12345678910&id=374534");
             torrentInfo.InfoUrl.Should().BeNullOrEmpty();
             torrentInfo.CommentUrl.Should().BeNullOrEmpty();
@@ -83,7 +83,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests
             var torrentInfo = releases.First() as TorrentInfo;
 
             torrentInfo.Title.Should().Be("S4C I Grombil Cyfandir Pell American Interior [PDTV - MVGROUP]");
-            torrentInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);
+            torrentInfo.DownloadProtocol.Should().Be(nameof(TorrentDownloadProtocol));
             torrentInfo.DownloadUrl.Should().Be("http://re.zoink.it/20a4ed4eFC");
             torrentInfo.InfoUrl.Should().Be("http://eztv.it/ep/58439/s4c-i-grombil-cyfandir-pell-american-interior-pdtv-x264-mvgroup/");
             torrentInfo.CommentUrl.Should().Be("http://eztv.it/forum/discuss/58439/");
@@ -111,7 +111,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests
             var torrentInfo = releases.First() as TorrentInfo;
 
             torrentInfo.Title.Should().Be("The Voice 8x25");
-            torrentInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);
+            torrentInfo.DownloadProtocol.Should().Be(nameof(TorrentDownloadProtocol));
             torrentInfo.DownloadUrl.Should().Be("magnet:?xt=urn:btih:96CD620BEDA3EFD7C4D7746EF94549D03A2EB13B&dn=The+Voice+S08E25+WEBRip+x264+WNN&tr=udp://tracker.coppersurfer.tk:6969/announce&tr=udp://tracker.leechers-paradise.org:6969&tr=udp://open.demonii.com:1337");
             torrentInfo.InfoUrl.Should().BeNullOrEmpty();
             torrentInfo.CommentUrl.Should().BeNullOrEmpty();
@@ -139,7 +139,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests
             var torrentInfo = releases.First() as TorrentInfo;
 
             torrentInfo.Title.Should().Be("[Doki] PriPara   50 (848x480 h264 AAC) [6F0B49FD] mkv");
-            torrentInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);
+            torrentInfo.DownloadProtocol.Should().Be(nameof(TorrentDownloadProtocol));
             torrentInfo.DownloadUrl.Should().Be("http://tracker.anime-index.org/download.php?id=82d8ad84403e01a7786130905ca169a3429e657f&f=%5BDoki%5D+PriPara+-+50+%28848x480+h264+AAC%29+%5B6F0B49FD%5D.mkv.torrent");
             torrentInfo.InfoUrl.Should().BeNullOrEmpty();
             torrentInfo.CommentUrl.Should().BeNullOrEmpty();
@@ -165,7 +165,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests
             var torrentInfo = releases.First() as TorrentInfo;
 
             torrentInfo.Title.Should().Be("One.Piece.E334.D ED.720p.HDTV.x264-W4F-={SPARROW}=-");
-            torrentInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);
+            torrentInfo.DownloadProtocol.Should().Be(nameof(TorrentDownloadProtocol));
             torrentInfo.DownloadUrl.Should().Be("http://ac.me/download/4722030/One.Piece.E334.D+ED.720p.HDTV.x264-W4F-%3D%7BSPARROW%7D%3D-.torrent");
             torrentInfo.InfoUrl.Should().BeNullOrEmpty();
             torrentInfo.CommentUrl.Should().BeNullOrEmpty();
@@ -191,7 +191,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests
             var torrentInfo = releases.First() as TorrentInfo;
 
             torrentInfo.Title.Should().Be("The Expanse 2x04 (720p-HDTV-x264-SVA)[VTV]");
-            torrentInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);
+            torrentInfo.DownloadProtocol.Should().Be(nameof(TorrentDownloadProtocol));
             torrentInfo.DownloadUrl.Should().Be("http://itorrents.org/torrent/51C578C9823DD58F6EEA287C368ED935843D63AB.torrent?title=The-Expanse-2x04-(720p-HDTV-x264-SVA)[VTV]");
             torrentInfo.InfoUrl.Should().BeNullOrEmpty();
             torrentInfo.CommentUrl.Should().Be("http://www.limetorrents.cc/The-Expanse-2x04-(720p-HDTV-x264-SVA)[VTV]-torrent-8643587.html");
@@ -217,7 +217,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests
             var torrentInfo = releases.First() as TorrentInfo;
 
             torrentInfo.Title.Should().Be("[FFF] Ore Monogatari!! - Vol.01 [BD][720p-AAC]");
-            torrentInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);
+            torrentInfo.DownloadProtocol.Should().Be(nameof(TorrentDownloadProtocol));
             torrentInfo.DownloadUrl.Should().Be("http://storage.animetosho.org/torrents/85a570f25067f69b3c83b901ce6c00c491345288/%5BFFF%5D%20Ore%20Monogatari%21%21%20-%20Vol.01%20%5BBD%5D%5B720p-AAC%5D.torrent");
             torrentInfo.InfoUrl.Should().BeNullOrEmpty();
             torrentInfo.CommentUrl.Should().Be("https://animetosho.org/view/fff-ore-monogatari-vol-01-bd-720p-aac.1009077");
@@ -243,7 +243,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests
             var torrentInfo = releases.Last() as TorrentInfo;
 
             torrentInfo.Title.Should().Be("DAYS - 05 (1280x720 HEVC2 AAC).mkv");
-            torrentInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);
+            torrentInfo.DownloadProtocol.Should().Be(nameof(TorrentDownloadProtocol));
             torrentInfo.DownloadUrl.Should().Be("http://storage.animetosho.org/torrents/4b58360143d59a55cbd922397a3eaa378165f3ff/DAYS%20-%2005%20%281280x720%20HEVC2%20AAC%29.torrent");
         }
 
@@ -260,7 +260,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests
             var torrentInfo = releases.Last() as TorrentInfo;
 
             torrentInfo.Title.Should().Be("TvHD 465860 465831 WWE.RAW.2016.11.28.720p.HDTV.x264-KYR");
-            torrentInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);
+            torrentInfo.DownloadProtocol.Should().Be(nameof(TorrentDownloadProtocol));
             torrentInfo.DownloadUrl.Should().Be("https://alpharatio.cc/torrents.php?action=download&authkey=private_auth_key&torrent_pass=private_torrent_pass&id=465831");
         }
 
@@ -278,7 +278,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests
             var torrentInfo = releases.First() as TorrentInfo;
 
             torrentInfo.Title.Should().Be("[TVShow --> TVShow Bluray 720p] Fargo S01 Complete Season 1 720p BRRip DD5.1 x264-PSYPHER [SEEDERS (3)/LEECHERS (0)]");
-            torrentInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);
+            torrentInfo.DownloadProtocol.Should().Be(nameof(TorrentDownloadProtocol));
             torrentInfo.DownloadUrl.Should().Be("http://ew.pw/download.php?id=dea071a7a62a0d662538d46402fb112f30b8c9fa&f=Fargo%20S01%20Complete%20Season%201%20720p%20BRRip%20DD5.1%20x264-PSYPHER.torrent&auth=secret");
             torrentInfo.InfoUrl.Should().BeNullOrEmpty();
             torrentInfo.CommentUrl.Should().BeNullOrEmpty();
diff --git a/src/NzbDrone.Core.Test/IndexerTests/TorrentleechTests/TorrentleechFixture.cs b/src/NzbDrone.Core.Test/IndexerTests/TorrentleechTests/TorrentleechFixture.cs
index a40b246d2..f03912e1d 100644
--- a/src/NzbDrone.Core.Test/IndexerTests/TorrentleechTests/TorrentleechFixture.cs
+++ b/src/NzbDrone.Core.Test/IndexerTests/TorrentleechTests/TorrentleechFixture.cs
@@ -43,7 +43,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentleechTests
             var torrentInfo = releases.First() as TorrentInfo;
 
             torrentInfo.Title.Should().Be("Classic Car Rescue S02E04 720p HDTV x264-C4TV");
-            torrentInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);
+            torrentInfo.DownloadProtocol.Should().Be(nameof(TorrentDownloadProtocol));
             torrentInfo.DownloadUrl.Should().Be("http://www.torrentleech.org/rss/download/513575/1234/Classic.Car.Rescue.S02E04.720p.HDTV.x264-C4TV.torrent");
             torrentInfo.InfoUrl.Should().Be("http://www.torrentleech.org/torrent/513575");
             torrentInfo.CommentUrl.Should().Be("http://www.torrentleech.org/torrent/513575#comments");
diff --git a/src/NzbDrone.Core.Test/IndexerTests/TorznabTests/TorznabFixture.cs b/src/NzbDrone.Core.Test/IndexerTests/TorznabTests/TorznabFixture.cs
index 7098d758f..971bff144 100644
--- a/src/NzbDrone.Core.Test/IndexerTests/TorznabTests/TorznabFixture.cs
+++ b/src/NzbDrone.Core.Test/IndexerTests/TorznabTests/TorznabFixture.cs
@@ -61,7 +61,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorznabTests
             var releaseInfo = releases.First() as TorrentInfo;
 
             releaseInfo.Title.Should().Be("Better Call Saul S01E05 Alpine Shepherd 1080p NF WEBRip DD5.1 x264");
-            releaseInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);
+            releaseInfo.DownloadProtocol.Should().Be(nameof(TorrentDownloadProtocol));
             releaseInfo.DownloadUrl.Should().Be("https://hdaccess.net/download.php?torrent=11515&passkey=123456");
             releaseInfo.InfoUrl.Should().Be("https://hdaccess.net/details.php?id=11515&hit=1");
             releaseInfo.CommentUrl.Should().Be("https://hdaccess.net/details.php?id=11515&hit=1#comments");
@@ -90,7 +90,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorznabTests
             var releaseInfo = releases.First() as TorrentInfo;
 
             releaseInfo.Title.Should().Be("Series Title S05E02 HDTV x264-Xclusive [eztv]");
-            releaseInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);
+            releaseInfo.DownloadProtocol.Should().Be(nameof(TorrentDownloadProtocol));
             releaseInfo.MagnetUrl.Should().Be("magnet:?xt=urn:btih:9fb267cff5ae5603f07a347676ec3bf3e35f75e1&dn=Game+of+Thrones+S05E02+HDTV+x264-Xclusive+%5Beztv%5D&tr=udp:%2F%2Fopen.demonii.com:1337&tr=udp:%2F%2Ftracker.coppersurfer.tk:6969&tr=udp:%2F%2Ftracker.leechers-paradise.org:6969&tr=udp:%2F%2Fexodus.desync.com:6969");
             releaseInfo.DownloadUrl.Should().Be("magnet:?xt=urn:btih:9fb267cff5ae5603f07a347676ec3bf3e35f75e1&dn=Game+of+Thrones+S05E02+HDTV+x264-Xclusive+%5Beztv%5D&tr=udp:%2F%2Fopen.demonii.com:1337&tr=udp:%2F%2Ftracker.coppersurfer.tk:6969&tr=udp:%2F%2Ftracker.leechers-paradise.org:6969&tr=udp:%2F%2Fexodus.desync.com:6969");
             releaseInfo.InfoUrl.Should().Be("https://thepiratebay.se/torrent/11811366/Series_Title_S05E02_HDTV_x264-Xclusive_%5Beztv%5D");
diff --git a/src/NzbDrone.Core/Blocklisting/Blocklist.cs b/src/NzbDrone.Core/Blocklisting/Blocklist.cs
index 17c092924..1c0349951 100644
--- a/src/NzbDrone.Core/Blocklisting/Blocklist.cs
+++ b/src/NzbDrone.Core/Blocklisting/Blocklist.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using NzbDrone.Core.Datastore;
-using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Music;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Qualities;
@@ -18,7 +17,7 @@ namespace NzbDrone.Core.Blocklisting
         public DateTime Date { get; set; }
         public DateTime? PublishedDate { get; set; }
         public long? Size { get; set; }
-        public DownloadProtocol Protocol { get; set; }
+        public string Protocol { get; set; }
         public string Indexer { get; set; }
         public IndexerFlags IndexerFlags { get; set; }
         public string Message { get; set; }
diff --git a/src/NzbDrone.Core/Blocklisting/BlocklistService.cs b/src/NzbDrone.Core/Blocklisting/BlocklistService.cs
index 18c4503f1..0e8015743 100644
--- a/src/NzbDrone.Core/Blocklisting/BlocklistService.cs
+++ b/src/NzbDrone.Core/Blocklisting/BlocklistService.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Download;
-using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Messaging.Commands;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.Music.Events;
@@ -23,47 +21,35 @@ namespace NzbDrone.Core.Blocklisting
     }
 
     public class BlocklistService : IBlocklistService,
-
                                     IExecute<ClearBlocklistCommand>,
                                     IHandle<DownloadFailedEvent>,
                                     IHandleAsync<ArtistsDeletedEvent>
     {
         private readonly IBlocklistRepository _blocklistRepository;
+        private readonly List<IBlocklistForProtocol> _protocolBlocklists;
 
-        public BlocklistService(IBlocklistRepository blocklistRepository)
+        public BlocklistService(IBlocklistRepository blocklistRepository,
+                                IEnumerable<IBlocklistForProtocol> protocolBlocklists)
         {
             _blocklistRepository = blocklistRepository;
+            _protocolBlocklists = protocolBlocklists.ToList();
         }
 
         public bool Blocklisted(int artistId, ReleaseInfo release)
         {
-            if (release.DownloadProtocol == DownloadProtocol.Torrent)
-            {
-                if (release is not TorrentInfo torrentInfo)
-                {
-                    return false;
-                }
-
-                if (torrentInfo.InfoHash.IsNotNullOrWhiteSpace())
-                {
-                    var blocklistedByTorrentInfohash = _blocklistRepository.BlocklistedByTorrentInfoHash(artistId, torrentInfo.InfoHash);
-
-                    return blocklistedByTorrentInfohash.Any(b => SameTorrent(b, torrentInfo));
-                }
+            var protocolBlocklist = _protocolBlocklists.FirstOrDefault(x => x.Protocol == release.DownloadProtocol);
 
-                return _blocklistRepository.BlocklistedByTitle(artistId, release.Title)
-                    .Where(b => b.Protocol == DownloadProtocol.Torrent)
-                    .Any(b => SameTorrent(b, torrentInfo));
+            if (protocolBlocklist != null)
+            {
+                return protocolBlocklist.IsBlocklisted(artistId, release);
             }
 
-            return _blocklistRepository.BlocklistedByTitle(artistId, release.Title)
-                .Where(b => b.Protocol == DownloadProtocol.Usenet)
-                .Any(b => SameNzb(b, release));
+            return false;
         }
 
-        public bool BlocklistedTorrentHash(int artistId, string hash)
+        public bool BlocklistedTorrentHash(int seriesId, string hash)
         {
-            return _blocklistRepository.BlocklistedByTorrentInfoHash(artistId, hash).Any(b =>
+            return _blocklistRepository.BlocklistedByTorrentInfoHash(seriesId, hash).Any(b =>
                 b.TorrentInfoHash.Equals(hash, StringComparison.InvariantCultureIgnoreCase));
         }
 
@@ -106,66 +92,6 @@ namespace NzbDrone.Core.Blocklisting
             _blocklistRepository.DeleteMany(ids);
         }
 
-        private bool SameNzb(Blocklist item, ReleaseInfo release)
-        {
-            if (item.PublishedDate == release.PublishDate)
-            {
-                return true;
-            }
-
-            if (!HasSameIndexer(item, release.Indexer) &&
-                HasSamePublishedDate(item, release.PublishDate) &&
-                HasSameSize(item, release.Size))
-            {
-                return true;
-            }
-
-            return false;
-        }
-
-        private bool SameTorrent(Blocklist item, TorrentInfo release)
-        {
-            if (release.InfoHash.IsNotNullOrWhiteSpace())
-            {
-                return release.InfoHash.Equals(item.TorrentInfoHash, StringComparison.InvariantCultureIgnoreCase);
-            }
-
-            return HasSameIndexer(item, release.Indexer);
-        }
-
-        private bool HasSameIndexer(Blocklist item, string indexer)
-        {
-            if (item.Indexer.IsNullOrWhiteSpace())
-            {
-                return true;
-            }
-
-            return item.Indexer.Equals(indexer, StringComparison.InvariantCultureIgnoreCase);
-        }
-
-        private bool HasSamePublishedDate(Blocklist item, DateTime publishedDate)
-        {
-            if (!item.PublishedDate.HasValue)
-            {
-                return true;
-            }
-
-            return item.PublishedDate.Value.AddMinutes(-2) <= publishedDate &&
-                   item.PublishedDate.Value.AddMinutes(2) >= publishedDate;
-        }
-
-        private bool HasSameSize(Blocklist item, long size)
-        {
-            if (!item.Size.HasValue)
-            {
-                return true;
-            }
-
-            var difference = Math.Abs(item.Size.Value - size);
-
-            return difference <= 2.Megabytes();
-        }
-
         public void Execute(ClearBlocklistCommand message)
         {
             _blocklistRepository.Purge();
@@ -173,27 +99,19 @@ namespace NzbDrone.Core.Blocklisting
 
         public void Handle(DownloadFailedEvent message)
         {
-            var blocklist = new Blocklist
-            {
-                ArtistId = message.ArtistId,
-                AlbumIds = message.AlbumIds,
-                SourceTitle = message.SourceTitle,
-                Quality = message.Quality,
-                Date = DateTime.UtcNow,
-                PublishedDate = DateTime.Parse(message.Data.GetValueOrDefault("publishedDate")),
-                Size = long.Parse(message.Data.GetValueOrDefault("size", "0")),
-                Indexer = message.Data.GetValueOrDefault("indexer"),
-                Protocol = (DownloadProtocol)Convert.ToInt32(message.Data.GetValueOrDefault("protocol")),
-                Message = message.Message,
-                TorrentInfoHash = message.Data.GetValueOrDefault("torrentInfoHash")
-            };
+            var protocolBlocklist = _protocolBlocklists.FirstOrDefault(x => x.Protocol == message.Data.GetValueOrDefault("protocol"));
 
-            if (Enum.TryParse(message.Data.GetValueOrDefault("indexerFlags"), true, out IndexerFlags flags))
+            if (protocolBlocklist != null)
             {
-                blocklist.IndexerFlags = flags;
-            }
+                var blocklist = protocolBlocklist.GetBlocklist(message);
 
-            _blocklistRepository.Insert(blocklist);
+                if (Enum.TryParse(message.Data.GetValueOrDefault("indexerFlags"), true, out IndexerFlags flags))
+                {
+                    blocklist.IndexerFlags = flags;
+                }
+
+                _blocklistRepository.Insert(blocklist);
+            }
         }
 
         public void HandleAsync(ArtistsDeletedEvent message)
diff --git a/src/NzbDrone.Core/Blocklisting/IBlocklistForProtocol.cs b/src/NzbDrone.Core/Blocklisting/IBlocklistForProtocol.cs
new file mode 100644
index 000000000..5711af157
--- /dev/null
+++ b/src/NzbDrone.Core/Blocklisting/IBlocklistForProtocol.cs
@@ -0,0 +1,12 @@
+using NzbDrone.Core.Download;
+using NzbDrone.Core.Parser.Model;
+
+namespace NzbDrone.Core.Blocklisting
+{
+    public interface IBlocklistForProtocol
+    {
+        string Protocol { get; }
+        bool IsBlocklisted(int artistId, ReleaseInfo release);
+        Blocklist GetBlocklist(DownloadFailedEvent message);
+    }
+}
diff --git a/src/NzbDrone.Core/Blocklisting/TorrentBlocklist.cs b/src/NzbDrone.Core/Blocklisting/TorrentBlocklist.cs
new file mode 100644
index 000000000..804d70c96
--- /dev/null
+++ b/src/NzbDrone.Core/Blocklisting/TorrentBlocklist.cs
@@ -0,0 +1,69 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Core.Download;
+using NzbDrone.Core.Indexers;
+using NzbDrone.Core.Parser.Model;
+
+namespace NzbDrone.Core.Blocklisting
+{
+    public class TorrentBlocklist : IBlocklistForProtocol
+    {
+        private readonly IBlocklistRepository _blocklistRepository;
+
+        public TorrentBlocklist(IBlocklistRepository blocklistRepository)
+        {
+            _blocklistRepository = blocklistRepository;
+        }
+
+        public string Protocol => nameof(TorrentDownloadProtocol);
+
+        public bool IsBlocklisted(int artistId, ReleaseInfo release)
+        {
+            if (release is not TorrentInfo torrentInfo)
+            {
+                return false;
+            }
+
+            if (torrentInfo.InfoHash.IsNotNullOrWhiteSpace())
+            {
+                var blocklistedByTorrentInfohash = _blocklistRepository.BlocklistedByTorrentInfoHash(artistId, torrentInfo.InfoHash);
+
+                return blocklistedByTorrentInfohash.Any(b => SameTorrent(b, torrentInfo));
+            }
+
+            return _blocklistRepository.BlocklistedByTitle(artistId, release.Title)
+                .Where(b => b.Protocol == Protocol)
+                .Any(b => SameTorrent(b, torrentInfo));
+        }
+
+        public Blocklist GetBlocklist(DownloadFailedEvent message)
+        {
+            return new Blocklist
+            {
+                ArtistId = message.ArtistId,
+                AlbumIds = message.AlbumIds,
+                SourceTitle = message.SourceTitle,
+                Quality = message.Quality,
+                Date = DateTime.UtcNow,
+                PublishedDate = DateTime.Parse(message.Data.GetValueOrDefault("publishedDate")),
+                Size = long.Parse(message.Data.GetValueOrDefault("size", "0")),
+                Indexer = message.Data.GetValueOrDefault("indexer"),
+                Protocol = message.Data.GetValueOrDefault("protocol"),
+                Message = message.Message,
+                TorrentInfoHash = message.Data.GetValueOrDefault("torrentInfoHash")
+            };
+        }
+
+        private bool SameTorrent(Blocklist item, TorrentInfo release)
+        {
+            if (release.InfoHash.IsNotNullOrWhiteSpace())
+            {
+                return release.InfoHash.Equals(item.TorrentInfoHash);
+            }
+
+            return item.Indexer.Equals(release.Indexer, StringComparison.InvariantCultureIgnoreCase);
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/Blocklisting/UsenetBlocklist.cs b/src/NzbDrone.Core/Blocklisting/UsenetBlocklist.cs
new file mode 100644
index 000000000..28b1f86f9
--- /dev/null
+++ b/src/NzbDrone.Core/Blocklisting/UsenetBlocklist.cs
@@ -0,0 +1,96 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Core.Download;
+using NzbDrone.Core.Indexers;
+using NzbDrone.Core.Parser.Model;
+
+namespace NzbDrone.Core.Blocklisting
+{
+    public class UsenetBlocklist : IBlocklistForProtocol
+    {
+        private readonly IBlocklistRepository _blocklistRepository;
+
+        public UsenetBlocklist(IBlocklistRepository blocklistRepository)
+        {
+            _blocklistRepository = blocklistRepository;
+        }
+
+        public string Protocol => nameof(UsenetDownloadProtocol);
+
+        public bool IsBlocklisted(int artistId, ReleaseInfo release)
+        {
+            return _blocklistRepository.BlocklistedByTitle(artistId, release.Title)
+                .Where(b => b.Protocol == Protocol)
+                .Any(b => SameNzb(b, release));
+        }
+
+        public Blocklist GetBlocklist(DownloadFailedEvent message)
+        {
+            return new Blocklist
+            {
+                ArtistId = message.ArtistId,
+                AlbumIds = message.AlbumIds,
+                SourceTitle = message.SourceTitle,
+                Quality = message.Quality,
+                Date = DateTime.UtcNow,
+                PublishedDate = DateTime.Parse(message.Data.GetValueOrDefault("publishedDate")),
+                Size = long.Parse(message.Data.GetValueOrDefault("size", "0")),
+                Indexer = message.Data.GetValueOrDefault("indexer"),
+                Protocol = message.Data.GetValueOrDefault("protocol"),
+                Message = message.Message,
+            };
+        }
+
+        private bool SameNzb(Blocklist item, ReleaseInfo release)
+        {
+            if (item.PublishedDate == release.PublishDate)
+            {
+                return true;
+            }
+
+            if (!HasSameIndexer(item, release.Indexer) &&
+                HasSamePublishedDate(item, release.PublishDate) &&
+                HasSameSize(item, release.Size))
+            {
+                return true;
+            }
+
+            return false;
+        }
+
+        private bool HasSameIndexer(Blocklist item, string indexer)
+        {
+            if (item.Indexer.IsNullOrWhiteSpace())
+            {
+                return true;
+            }
+
+            return item.Indexer.Equals(indexer, StringComparison.InvariantCultureIgnoreCase);
+        }
+
+        private bool HasSamePublishedDate(Blocklist item, DateTime publishedDate)
+        {
+            if (!item.PublishedDate.HasValue)
+            {
+                return true;
+            }
+
+            return item.PublishedDate.Value.AddMinutes(-2) <= publishedDate &&
+                   item.PublishedDate.Value.AddMinutes(2) >= publishedDate;
+        }
+
+        private bool HasSameSize(Blocklist item, long size)
+        {
+            if (!item.Size.HasValue)
+            {
+                return true;
+            }
+
+            var difference = Math.Abs(item.Size.Value - size);
+
+            return difference <= 2.Megabytes();
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/Datastore/Migration/043_flexible_delay_profiles.cs b/src/NzbDrone.Core/Datastore/Migration/043_flexible_delay_profiles.cs
new file mode 100644
index 000000000..2a8d2803c
--- /dev/null
+++ b/src/NzbDrone.Core/Datastore/Migration/043_flexible_delay_profiles.cs
@@ -0,0 +1,146 @@
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using Dapper;
+using FluentMigrator;
+using NzbDrone.Core.Datastore.Converters;
+using NzbDrone.Core.Datastore.Migration.Framework;
+using NzbDrone.Core.Indexers;
+
+namespace NzbDrone.Core.Datastore.Migration
+{
+    [Migration(043)]
+    public class flexible_delay_profiles : NzbDroneMigrationBase
+    {
+        protected override void MainDbUpgrade()
+        {
+            Alter.Table("DelayProfiles").AddColumn("Name").AsString().Nullable();
+            Alter.Table("DelayProfiles").AddColumn("Items").AsString().WithDefaultValue("[]");
+
+            Execute.WithConnection(MigrateDelayProfiles);
+
+            Delete.Column("EnableUsenet").FromTable("DelayProfiles");
+            Delete.Column("EnableTorrent").FromTable("DelayProfiles");
+            Delete.Column("PreferredProtocol").FromTable("DelayProfiles");
+            Delete.Column("UsenetDelay").FromTable("DelayProfiles");
+            Delete.Column("TorrentDelay").FromTable("DelayProfiles");
+
+            // this migration was merged after 52, so it may be that DownloadHistory was created with Protocol as an int
+            // and not a string.
+            if (Schema.Table("DownloadHistory").Exists())
+            {
+                Alter.Table("DownloadHistory").AddColumn("ProtocolString").AsString().Nullable();
+                Execute.WithConnection(MigrateDownloadHistory);
+                Delete.Column("Protocol").FromTable("DownloadHistory");
+                Rename.Column("ProtocolString").OnTable("DownloadHistory").To("Protocol");
+            }
+        }
+
+        private void MigrateDownloadHistory(IDbConnection conn, IDbTransaction tran)
+        {
+            var rows = conn.Query<DownloadHistory52>("SELECT \"Id\", \"Protocol\" from \"DownloadHistory\"", transaction: tran);
+
+            var newRows = rows.Select(row => new DownloadHistory43
+            {
+                Id = row.Id,
+                ProtocolString = row.Protocol == 1 ? nameof(UsenetDownloadProtocol) : nameof(TorrentDownloadProtocol)
+            }).ToList();
+
+            var sql = $"UPDATE \"DownloadHistory\" SET \"ProtocolString\" = @ProtocolString WHERE \"Id\" = @Id";
+            conn.Execute(sql, newRows, transaction: tran);
+        }
+
+        private class DownloadHistory52 : ModelBase
+        {
+            public int Protocol { get; set; }
+        }
+
+        public class DownloadHistory43 : ModelBase
+        {
+            public string ProtocolString { get; set; }
+        }
+
+        private void MigrateDelayProfiles(IDbConnection conn, IDbTransaction tran)
+        {
+            SqlMapper.AddTypeHandler(new EmbeddedDocumentConverter<List<DelayProfileProtocolItem42>>());
+
+            var rows = conn.Query<DelayProfile41>("SELECT * from \"DelayProfiles\"", transaction: tran);
+            var newRows = new List<DelayProfile42>();
+
+            foreach (var row in rows)
+            {
+                var usenet = new DelayProfileProtocolItem42
+                {
+                    Name = "Usenet",
+                    Protocol = nameof(UsenetDownloadProtocol),
+                    Allowed = row.EnableUsenet,
+                    Delay = row.UsenetDelay
+                };
+
+                var torrent = new DelayProfileProtocolItem42
+                {
+                    Name = "Torrent",
+                    Protocol = nameof(TorrentDownloadProtocol),
+                    Allowed = row.EnableTorrent,
+                    Delay = row.TorrentDelay
+                };
+
+                List<DelayProfileProtocolItem42> items;
+
+                if (row.PreferredProtocol == 2)
+                {
+                    items = new List<DelayProfileProtocolItem42>
+                    {
+                        torrent,
+                        usenet
+                    };
+                }
+                else
+                {
+                    items = new List<DelayProfileProtocolItem42>
+                    {
+                        usenet,
+                        torrent
+                    };
+                }
+
+                newRows.Add(new DelayProfile42
+                {
+                    Id = row.Id,
+                    Name = row.Id == 1 ? "Default" : $"Delay Profile {row.Id}",
+                    Items = items
+                });
+            }
+
+            var sql = $"UPDATE \"DelayProfiles\" SET \"Name\" = @Name, \"Items\" = @Items WHERE \"Id\" = @Id";
+            conn.Execute(sql, newRows, transaction: tran);
+        }
+
+        private class DelayProfile41 : ModelBase
+        {
+            public bool EnableUsenet { get; set; }
+            public bool EnableTorrent { get; set; }
+            public int PreferredProtocol { get; set; }
+            public int UsenetDelay { get; set; }
+            public int TorrentDelay { get; set; }
+            public int Order { get; set; }
+            public HashSet<int> Tags { get; set; }
+        }
+
+        private class DelayProfile42 : ModelBase
+        {
+            public string Name { get; set; }
+            public List<DelayProfileProtocolItem42> Items { get; set; }
+            public int Order { get; set; }
+            public HashSet<int> Tags { get; set; }
+        }
+
+        private class DelayProfileProtocolItem42 : IEmbeddedDocument
+        {
+            public string Name { get; set; }
+            public string Protocol { get; set; }
+            public bool Allowed { get; set; }
+            public int Delay { get; set; }
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/Datastore/Migration/046_convert_blacklist_protocol.cs b/src/NzbDrone.Core/Datastore/Migration/046_convert_blacklist_protocol.cs
new file mode 100644
index 000000000..e7a7a2be0
--- /dev/null
+++ b/src/NzbDrone.Core/Datastore/Migration/046_convert_blacklist_protocol.cs
@@ -0,0 +1,21 @@
+using FluentMigrator;
+using NzbDrone.Core.Datastore.Migration.Framework;
+
+namespace NzbDrone.Core.Datastore.Migration
+{
+    [Migration(046)]
+    public class convert_blacklist_protocol : NzbDroneMigrationBase
+    {
+        protected override void MainDbUpgrade()
+        {
+            // This may get run after the blacklist -> blocklist migration
+            var table = Schema.Table("Blacklist").Exists() ? "Blacklist" : "Blocklist";
+
+            Alter.Table(table).AlterColumn("Protocol").AsString().Nullable();
+
+            Execute.Sql($"DELETE FROM \"{table}\" WHERE \"Protocol\" = '0'");
+            Execute.Sql($"UPDATE \"{table}\" SET \"Protocol\" = 'UsenetDownloadProtocol' WHERE \"Protocol\" = '1'");
+            Execute.Sql($"UPDATE \"{table}\" SET \"Protocol\" = 'TorrentDownloadProtocol' WHERE \"Protocol\" = '2'");
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/Datastore/Migration/052_download_history.cs b/src/NzbDrone.Core/Datastore/Migration/052_download_history.cs
index 8c6319103..b100dd573 100644
--- a/src/NzbDrone.Core/Datastore/Migration/052_download_history.cs
+++ b/src/NzbDrone.Core/Datastore/Migration/052_download_history.cs
@@ -1,9 +1,9 @@
-using System;
 using System.Collections.Generic;
 using System.Data;
 using FluentMigrator;
 using NzbDrone.Common.Serializer;
 using NzbDrone.Core.Datastore.Migration.Framework;
+using NzbDrone.Core.Indexers;
 
 namespace NzbDrone.Core.Datastore.Migration
 {
@@ -18,7 +18,7 @@ namespace NzbDrone.Core.Datastore.Migration
                   .WithColumn("DownloadId").AsString().NotNullable()
                   .WithColumn("SourceTitle").AsString().NotNullable()
                   .WithColumn("Date").AsDateTime().NotNullable()
-                  .WithColumn("Protocol").AsInt32().Nullable()
+                  .WithColumn("Protocol").AsString().Nullable()
                   .WithColumn("IndexerId").AsInt32().Nullable()
                   .WithColumn("DownloadClientId").AsInt32().Nullable()
                   .WithColumn("Release").AsString().Nullable()
@@ -69,7 +69,27 @@ namespace NzbDrone.Core.Datastore.Migration
                         var data = Json.Deserialize<Dictionary<string, string>>(rawData);
 
                         var downloadHistoryEventType = EventTypeMap[eventType];
-                        var protocol = data.ContainsKey("protocol") ? Convert.ToInt32(data["protocol"]) : (int?)null;
+
+                        string protocol = null;
+                        if (data.ContainsKey("protocol"))
+                        {
+                            if (int.TryParse(data["protocol"], out var protocolNum))
+                            {
+                                if (protocolNum == 1)
+                                {
+                                    protocol = nameof(UsenetDownloadProtocol);
+                                }
+                                else if (protocolNum == 2)
+                                {
+                                    protocol = nameof(TorrentDownloadProtocol);
+                                }
+                            }
+                            else
+                            {
+                                protocol = data["protocol"];
+                            }
+                        }
+
                         var downloadHistoryData = new Dictionary<string, string>();
 
                         if (data.ContainsKey("indexer"))
diff --git a/src/NzbDrone.Core/Datastore/TableMapping.cs b/src/NzbDrone.Core/Datastore/TableMapping.cs
index df2296951..a1ddd3ed8 100644
--- a/src/NzbDrone.Core/Datastore/TableMapping.cs
+++ b/src/NzbDrone.Core/Datastore/TableMapping.cs
@@ -247,7 +247,7 @@ namespace NzbDrone.Core.Datastore
 
         private static void RegisterProviderSettingConverter()
         {
-            var settingTypes = typeof(IProviderConfig).Assembly.ImplementationsOf<IProviderConfig>()
+            var settingTypes = ReflectionExtensions.ImplementationsOf<IProviderConfig>()
                 .Where(x => !x.ContainsGenericParameters);
 
             var providerSettingConverter = new ProviderSettingConverter();
@@ -259,7 +259,7 @@ namespace NzbDrone.Core.Datastore
 
         private static void RegisterEmbeddedConverter()
         {
-            var embeddedTypes = typeof(IEmbeddedDocument).Assembly.ImplementationsOf<IEmbeddedDocument>();
+            var embeddedTypes = ReflectionExtensions.ImplementationsOf<IEmbeddedDocument>();
 
             var embeddedConverterDefinition = typeof(EmbeddedDocumentConverter<>).GetGenericTypeDefinition();
             var genericListDefinition = typeof(List<>).GetGenericTypeDefinition();
diff --git a/src/NzbDrone.Core/DecisionEngine/DownloadDecisionComparer.cs b/src/NzbDrone.Core/DecisionEngine/DownloadDecisionComparer.cs
index 7fe5ec1fc..65f94749e 100644
--- a/src/NzbDrone.Core/DecisionEngine/DownloadDecisionComparer.cs
+++ b/src/NzbDrone.Core/DecisionEngine/DownloadDecisionComparer.cs
@@ -89,8 +89,9 @@ namespace NzbDrone.Core.DecisionEngine
             var result = CompareBy(x.RemoteAlbum, y.RemoteAlbum, remoteAlbum =>
             {
                 var delayProfile = _delayProfileService.BestForTags(remoteAlbum.Artist.Tags);
-                var downloadProtocol = remoteAlbum.Release.DownloadProtocol;
-                return downloadProtocol == delayProfile.PreferredProtocol;
+
+                // Flip sign since most preferred is first
+                return -1 * delayProfile.Items.FindIndex(i => i.Protocol == remoteAlbum.Release.DownloadProtocol);
             });
 
             return result;
@@ -113,9 +114,9 @@ namespace NzbDrone.Core.DecisionEngine
         private int ComparePeersIfTorrent(DownloadDecision x, DownloadDecision y)
         {
             // Different protocols should get caught when checking the preferred protocol,
-            // since we're dealing with the same series in our comparisons
-            if (x.RemoteAlbum.Release.DownloadProtocol != DownloadProtocol.Torrent ||
-                y.RemoteAlbum.Release.DownloadProtocol != DownloadProtocol.Torrent)
+            // since we're dealing with the same series in our comparisions
+            if (x.RemoteAlbum.Release.DownloadProtocol != nameof(TorrentDownloadProtocol) ||
+                y.RemoteAlbum.Release.DownloadProtocol != nameof(TorrentDownloadProtocol))
             {
                 return 0;
             }
@@ -137,8 +138,8 @@ namespace NzbDrone.Core.DecisionEngine
 
         private int CompareAgeIfUsenet(DownloadDecision x, DownloadDecision y)
         {
-            if (x.RemoteAlbum.Release.DownloadProtocol != DownloadProtocol.Usenet ||
-                y.RemoteAlbum.Release.DownloadProtocol != DownloadProtocol.Usenet)
+            if (x.RemoteAlbum.Release.DownloadProtocol != nameof(UsenetDownloadProtocol) ||
+                y.RemoteAlbum.Release.DownloadProtocol != nameof(UsenetDownloadProtocol))
             {
                 return 0;
             }
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/AlreadyImportedSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/AlreadyImportedSpecification.cs
index da16edac8..1b31781f3 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/AlreadyImportedSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/AlreadyImportedSpecification.cs
@@ -79,7 +79,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
 
                 var release = subject.Release;
 
-                if (release.DownloadProtocol == DownloadProtocol.Torrent)
+                if (release.DownloadProtocol == nameof(TorrentDownloadProtocol))
                 {
                     var torrentInfo = release as TorrentInfo;
 
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/MinimumAgeSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/MinimumAgeSpecification.cs
index 3e322881d..264f45a54 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/MinimumAgeSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/MinimumAgeSpecification.cs
@@ -1,6 +1,7 @@
 using System;
 using NLog;
 using NzbDrone.Core.Configuration;
+using NzbDrone.Core.Indexers;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Parser.Model;
 
@@ -22,7 +23,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
 
         public virtual Decision IsSatisfiedBy(RemoteAlbum subject, SearchCriteriaBase searchCriteria)
         {
-            if (subject.Release.DownloadProtocol != Indexers.DownloadProtocol.Usenet)
+            if (subject.Release.DownloadProtocol != nameof(UsenetDownloadProtocol))
             {
                 _logger.Debug("Not checking minimum age requirement for non-usenet report");
                 return Decision.Accept();
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/ProtocolSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/ProtocolSpecification.cs
index dae103196..929e940a7 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/ProtocolSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/ProtocolSpecification.cs
@@ -1,5 +1,4 @@
 using NLog;
-using NzbDrone.Core.Indexers;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Profiles.Delay;
@@ -23,18 +22,13 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
 
         public virtual Decision IsSatisfiedBy(RemoteAlbum subject, SearchCriteriaBase searchCriteria)
         {
+            var protocol = subject.Release.DownloadProtocol;
             var delayProfile = _delayProfileService.BestForTags(subject.Artist.Tags);
 
-            if (subject.Release.DownloadProtocol == DownloadProtocol.Usenet && !delayProfile.EnableUsenet)
+            if (!delayProfile.IsAllowedProtocol(subject.Release.DownloadProtocol))
             {
-                _logger.Debug("[{0}] Usenet is not enabled for this artist", subject.Release.Title);
-                return Decision.Reject("Usenet is not enabled for this artist");
-            }
-
-            if (subject.Release.DownloadProtocol == DownloadProtocol.Torrent && !delayProfile.EnableTorrent)
-            {
-                _logger.Debug("[{0}] Torrent is not enabled for this artist", subject.Release.Title);
-                return Decision.Reject("Torrent is not enabled for this artist");
+                _logger.Debug("[{0}] {1} is not enabled for this artist", subject.Release.Title, protocol);
+                return Decision.Reject($"{protocol} is not enabled for this artist");
             }
 
             return Decision.Accept();
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/RetentionSpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/RetentionSpecification.cs
index c3deb05fd..085032d75 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/RetentionSpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/RetentionSpecification.cs
@@ -1,5 +1,6 @@
 using NLog;
 using NzbDrone.Core.Configuration;
+using NzbDrone.Core.Indexers;
 using NzbDrone.Core.IndexerSearch.Definitions;
 using NzbDrone.Core.Parser.Model;
 
@@ -21,7 +22,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
 
         public virtual Decision IsSatisfiedBy(RemoteAlbum subject, SearchCriteriaBase searchCriteria)
         {
-            if (subject.Release.DownloadProtocol != Indexers.DownloadProtocol.Usenet)
+            if (subject.Release.DownloadProtocol != nameof(UsenetDownloadProtocol))
             {
                 _logger.Debug("Not checking retention requirement for non-usenet report");
                 return Decision.Accept();
diff --git a/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/DelaySpecification.cs b/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/DelaySpecification.cs
index ff6ecbf63..ebcea6ff4 100644
--- a/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/DelaySpecification.cs
+++ b/src/NzbDrone.Core/DecisionEngine/Specifications/RssSync/DelaySpecification.cs
@@ -44,7 +44,7 @@ namespace NzbDrone.Core.DecisionEngine.Specifications.RssSync
             var qualityProfile = subject.Artist.QualityProfile.Value;
             var delayProfile = _delayProfileService.BestForTags(subject.Artist.Tags);
             var delay = delayProfile.GetProtocolDelay(subject.Release.DownloadProtocol);
-            var isPreferredProtocol = subject.Release.DownloadProtocol == delayProfile.PreferredProtocol;
+            var isPreferredProtocol = delayProfile.IsPreferredProtocol(subject.Release.DownloadProtocol);
 
             if (delay == 0)
             {
diff --git a/src/NzbDrone.Core/Download/Clients/Pneumatic/Pneumatic.cs b/src/NzbDrone.Core/Download/Clients/Pneumatic/Pneumatic.cs
index becc142d2..f6f830c80 100644
--- a/src/NzbDrone.Core/Download/Clients/Pneumatic/Pneumatic.cs
+++ b/src/NzbDrone.Core/Download/Clients/Pneumatic/Pneumatic.cs
@@ -31,7 +31,7 @@ namespace NzbDrone.Core.Download.Clients.Pneumatic
 
         public override string Name => "Pneumatic";
 
-        public override DownloadProtocol Protocol => DownloadProtocol.Usenet;
+        public override string Protocol => nameof(UsenetDownloadProtocol);
 
         public override async Task<string> Download(RemoteAlbum remoteAlbum, IIndexer indexer)
         {
diff --git a/src/NzbDrone.Core/Download/DownloadClientBase.cs b/src/NzbDrone.Core/Download/DownloadClientBase.cs
index 63ccf629e..0b09e275f 100644
--- a/src/NzbDrone.Core/Download/DownloadClientBase.cs
+++ b/src/NzbDrone.Core/Download/DownloadClientBase.cs
@@ -90,7 +90,7 @@ namespace NzbDrone.Core.Download
             return GetType().Name;
         }
 
-        public abstract DownloadProtocol Protocol { get; }
+        public abstract string Protocol { get; }
 
         public abstract Task<string> Download(RemoteAlbum remoteAlbum, IIndexer indexer);
         public abstract IEnumerable<DownloadClientItem> GetItems();
diff --git a/src/NzbDrone.Core/Download/DownloadClientDefinition.cs b/src/NzbDrone.Core/Download/DownloadClientDefinition.cs
index 524ca5e5c..9f6828b4e 100644
--- a/src/NzbDrone.Core/Download/DownloadClientDefinition.cs
+++ b/src/NzbDrone.Core/Download/DownloadClientDefinition.cs
@@ -1,11 +1,10 @@
-using NzbDrone.Core.Indexers;
 using NzbDrone.Core.ThingiProvider;
 
 namespace NzbDrone.Core.Download
 {
     public class DownloadClientDefinition : ProviderDefinition
     {
-        public DownloadProtocol Protocol { get; set; }
+        public string Protocol { get; set; }
         public int Priority { get; set; } = 1;
         public bool RemoveCompletedDownloads { get; set; } = true;
         public bool RemoveFailedDownloads { get; set; } = true;
diff --git a/src/NzbDrone.Core/Download/DownloadClientItem.cs b/src/NzbDrone.Core/Download/DownloadClientItem.cs
index 720cb3055..b4c86d8c8 100644
--- a/src/NzbDrone.Core/Download/DownloadClientItem.cs
+++ b/src/NzbDrone.Core/Download/DownloadClientItem.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Diagnostics;
 using NzbDrone.Common.Disk;
-using NzbDrone.Core.Indexers;
 using NzbDrone.Core.ThingiProvider;
 
 namespace NzbDrone.Core.Download
@@ -34,7 +33,7 @@ namespace NzbDrone.Core.Download
 
     public class DownloadClientItemClientInfo
     {
-        public DownloadProtocol Protocol { get; set; }
+        public string Protocol { get; set; }
         public string Type { get; set; }
         public int Id { get; set; }
         public string Name { get; set; }
diff --git a/src/NzbDrone.Core/Download/DownloadClientProvider.cs b/src/NzbDrone.Core/Download/DownloadClientProvider.cs
index c6d58b1b2..12eadb8d0 100644
--- a/src/NzbDrone.Core/Download/DownloadClientProvider.cs
+++ b/src/NzbDrone.Core/Download/DownloadClientProvider.cs
@@ -10,7 +10,7 @@ namespace NzbDrone.Core.Download
 {
     public interface IProvideDownloadClient
     {
-        IDownloadClient GetDownloadClient(DownloadProtocol downloadProtocol, int indexerId = 0, bool filterBlockedClients = false, HashSet<int> tags = null);
+        IDownloadClient GetDownloadClient(string downloadProtocol, int indexerId = 0, bool filterBlockedClients = false, HashSet<int> tags = null);
         IEnumerable<IDownloadClient> GetDownloadClients(bool filterBlockedClients = false);
         IDownloadClient Get(int id);
     }
@@ -36,7 +36,7 @@ namespace NzbDrone.Core.Download
             _lastUsedDownloadClient = cacheManager.GetCache<int>(GetType(), "lastDownloadClientId");
         }
 
-        public IDownloadClient GetDownloadClient(DownloadProtocol downloadProtocol, int indexerId = 0, bool filterBlockedClients = false, HashSet<int> tags = null)
+        public IDownloadClient GetDownloadClient(string downloadProtocol, int indexerId = 0, bool filterBlockedClients = false, HashSet<int> tags = null)
         {
             var blockedProviders = new HashSet<int>(_downloadClientStatusService.GetBlockedProviders().Select(v => v.ProviderId));
             var availableProviders = _downloadClientFactory.GetAvailableProviders().Where(v => v.Protocol == downloadProtocol).ToList();
diff --git a/src/NzbDrone.Core/Download/DownloadClientRepository.cs b/src/NzbDrone.Core/Download/DownloadClientRepository.cs
index 704dababc..f831b61bb 100644
--- a/src/NzbDrone.Core/Download/DownloadClientRepository.cs
+++ b/src/NzbDrone.Core/Download/DownloadClientRepository.cs
@@ -1,4 +1,5 @@
-using NzbDrone.Core.Datastore;
+using NLog;
+using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.ThingiProvider;
 
@@ -10,8 +11,10 @@ namespace NzbDrone.Core.Download
 
     public class DownloadClientRepository : ProviderRepository<DownloadClientDefinition>, IDownloadClientRepository
     {
-        public DownloadClientRepository(IMainDatabase database, IEventAggregator eventAggregator)
-            : base(database, eventAggregator)
+        public DownloadClientRepository(IMainDatabase database,
+                                        IEventAggregator eventAggregator,
+                                        Logger logger)
+        : base(database, eventAggregator, logger)
         {
         }
     }
diff --git a/src/NzbDrone.Core/Download/History/DownloadHistory.cs b/src/NzbDrone.Core/Download/History/DownloadHistory.cs
index 3cb6a3e5a..6dea29090 100644
--- a/src/NzbDrone.Core/Download/History/DownloadHistory.cs
+++ b/src/NzbDrone.Core/Download/History/DownloadHistory.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using NzbDrone.Core.Datastore;
-using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Parser.Model;
 
 namespace NzbDrone.Core.Download.History
@@ -13,7 +12,7 @@ namespace NzbDrone.Core.Download.History
         public string DownloadId { get; set; }
         public string SourceTitle { get; set; }
         public DateTime Date { get; set; }
-        public DownloadProtocol Protocol { get; set; }
+        public string Protocol { get; set; }
         public int IndexerId { get; set; }
         public int DownloadClientId { get; set; }
         public ReleaseInfo Release { get; set; }
diff --git a/src/NzbDrone.Core/Download/IDownloadClient.cs b/src/NzbDrone.Core/Download/IDownloadClient.cs
index de69027e3..a2001428b 100644
--- a/src/NzbDrone.Core/Download/IDownloadClient.cs
+++ b/src/NzbDrone.Core/Download/IDownloadClient.cs
@@ -8,7 +8,7 @@ namespace NzbDrone.Core.Download
 {
     public interface IDownloadClient : IProvider
     {
-        DownloadProtocol Protocol { get; }
+        string Protocol { get; }
         Task<string> Download(RemoteAlbum remoteAlbum, IIndexer indexer);
         IEnumerable<DownloadClientItem> GetItems();
         DownloadClientItem GetImportItem(DownloadClientItem item, DownloadClientItem previousImportAttempt);
diff --git a/src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs b/src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs
index 334a5e2b6..25acc48f8 100644
--- a/src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs
+++ b/src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs
@@ -474,16 +474,13 @@ namespace NzbDrone.Core.Download.Pending
             return HashConverter.GetHashInt31(string.Format("pending-{0}-album{1}", pendingRelease.Id, album?.Id ?? 0));
         }
 
-        private int PrioritizeDownloadProtocol(Artist artist, DownloadProtocol downloadProtocol)
+        private int PrioritizeDownloadProtocol(Artist artist, string downloadProtocol)
         {
             var delayProfile = _delayProfileService.BestForTags(artist.Tags);
 
-            if (downloadProtocol == delayProfile.PreferredProtocol)
-            {
-                return 0;
-            }
+            var index = delayProfile.Items.FindIndex(x => x.Protocol == downloadProtocol);
 
-            return 1;
+            return index >= 0 ? index : int.MaxValue;
         }
 
         public void Handle(ArtistsDeletedEvent message)
diff --git a/src/NzbDrone.Core/Download/ProcessDownloadDecisions.cs b/src/NzbDrone.Core/Download/ProcessDownloadDecisions.cs
index 23712e766..9b998aa91 100644
--- a/src/NzbDrone.Core/Download/ProcessDownloadDecisions.cs
+++ b/src/NzbDrone.Core/Download/ProcessDownloadDecisions.cs
@@ -64,8 +64,8 @@ namespace NzbDrone.Core.Download
                     continue;
                 }
 
-                if ((downloadProtocol == DownloadProtocol.Usenet && usenetFailed) ||
-                    (downloadProtocol == DownloadProtocol.Torrent && torrentFailed))
+                if ((downloadProtocol == nameof(UsenetDownloadProtocol) && usenetFailed) ||
+                    (downloadProtocol == nameof(TorrentDownloadProtocol) && torrentFailed))
                 {
                     PreparePending(pendingAddQueue, grabbed, pending, report, PendingReleaseReason.DownloadClientUnavailable);
                     continue;
@@ -97,11 +97,11 @@ namespace NzbDrone.Core.Download
                         {
                             PreparePending(pendingAddQueue, grabbed, pending, report, PendingReleaseReason.DownloadClientUnavailable);
 
-                            if (downloadProtocol == DownloadProtocol.Usenet)
+                            if (downloadProtocol == nameof(UsenetDownloadProtocol))
                             {
                                 usenetFailed = true;
                             }
-                            else if (downloadProtocol == DownloadProtocol.Torrent)
+                            else if (downloadProtocol == nameof(TorrentDownloadProtocol))
                             {
                                 torrentFailed = true;
                             }
diff --git a/src/NzbDrone.Core/Download/TorrentClientBase.cs b/src/NzbDrone.Core/Download/TorrentClientBase.cs
index 4e3ec11ab..ea60bb005 100644
--- a/src/NzbDrone.Core/Download/TorrentClientBase.cs
+++ b/src/NzbDrone.Core/Download/TorrentClientBase.cs
@@ -39,7 +39,7 @@ namespace NzbDrone.Core.Download
             _torrentFileInfoReader = torrentFileInfoReader;
         }
 
-        public override DownloadProtocol Protocol => DownloadProtocol.Torrent;
+        public override string Protocol => nameof(TorrentDownloadProtocol);
 
         public virtual bool PreferTorrentFile => false;
 
diff --git a/src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownload.cs b/src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownload.cs
index d4b4cfe20..7d657794e 100644
--- a/src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownload.cs
+++ b/src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownload.cs
@@ -1,5 +1,4 @@
 using System;
-using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Parser.Model;
 
 namespace NzbDrone.Core.Download.TrackedDownloads
@@ -13,7 +12,7 @@ namespace NzbDrone.Core.Download.TrackedDownloads
         public TrackedDownloadStatus Status { get; private set; }
         public RemoteAlbum RemoteAlbum { get; set; }
         public TrackedDownloadStatusMessage[] StatusMessages { get; private set; }
-        public DownloadProtocol Protocol { get; set; }
+        public string Protocol { get; set; }
         public string Indexer { get; set; }
         public DateTime? Added { get; set; }
         public bool IsTrackable { get; set; }
diff --git a/src/NzbDrone.Core/Download/UsenetClientBase.cs b/src/NzbDrone.Core/Download/UsenetClientBase.cs
index e14ac5a87..4da8e2c9d 100644
--- a/src/NzbDrone.Core/Download/UsenetClientBase.cs
+++ b/src/NzbDrone.Core/Download/UsenetClientBase.cs
@@ -31,7 +31,7 @@ namespace NzbDrone.Core.Download
             _nzbValidationService = nzbValidationService;
         }
 
-        public override DownloadProtocol Protocol => DownloadProtocol.Usenet;
+        public override string Protocol => nameof(UsenetDownloadProtocol);
 
         protected abstract string AddFromNzbFile(RemoteAlbum remoteAlbum, string filename, byte[] fileContent);
 
diff --git a/src/NzbDrone.Core/Extras/Metadata/MetadataRepository.cs b/src/NzbDrone.Core/Extras/Metadata/MetadataRepository.cs
index 942a5172b..4119c873d 100644
--- a/src/NzbDrone.Core/Extras/Metadata/MetadataRepository.cs
+++ b/src/NzbDrone.Core/Extras/Metadata/MetadataRepository.cs
@@ -1,4 +1,5 @@
-using NzbDrone.Core.Datastore;
+using NLog;
+using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.ThingiProvider;
 
@@ -10,8 +11,10 @@ namespace NzbDrone.Core.Extras.Metadata
 
     public class MetadataRepository : ProviderRepository<MetadataDefinition>, IMetadataRepository
     {
-        public MetadataRepository(IMainDatabase database, IEventAggregator eventAggregator)
-            : base(database, eventAggregator)
+        public MetadataRepository(IMainDatabase database,
+                                  IEventAggregator eventAggregator,
+                                  Logger logger)
+        : base(database, eventAggregator, logger)
         {
         }
     }
diff --git a/src/NzbDrone.Core/HealthCheck/Checks/PluginCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/PluginCheck.cs
new file mode 100644
index 000000000..375f18b10
--- /dev/null
+++ b/src/NzbDrone.Core/HealthCheck/Checks/PluginCheck.cs
@@ -0,0 +1,26 @@
+using NzbDrone.Common.Composition;
+using NzbDrone.Core.Localization;
+
+namespace NzbDrone.Core.HealthCheck.Checks
+{
+    public class PluginCheck : HealthCheckBase
+    {
+        private readonly PluginStatus _status;
+
+        public PluginCheck(PluginStatus status, ILocalizationService localizationService)
+            : base(localizationService)
+        {
+            _status = status;
+        }
+
+        public override HealthCheck Check()
+        {
+            if (!_status.Enabled)
+            {
+                return new HealthCheck(GetType(), HealthCheckResult.Error, "Plugins failed to load, check log for details", "#plugins-failed-to-load");
+            }
+
+            return new HealthCheck(GetType());
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/History/EntityHistoryService.cs b/src/NzbDrone.Core/History/EntityHistoryService.cs
index d94d0cf9e..bab760b2b 100644
--- a/src/NzbDrone.Core/History/EntityHistoryService.cs
+++ b/src/NzbDrone.Core/History/EntityHistoryService.cs
@@ -162,7 +162,7 @@ namespace NzbDrone.Core.History
                 history.Data.Add("Size", message.Album.Release.Size.ToString());
                 history.Data.Add("DownloadUrl", message.Album.Release.DownloadUrl);
                 history.Data.Add("Guid", message.Album.Release.Guid);
-                history.Data.Add("Protocol", ((int)message.Album.Release.DownloadProtocol).ToString());
+                history.Data.Add("Protocol", message.Album.Release.DownloadProtocol.ToString());
                 history.Data.Add("DownloadForced", (!message.Album.DownloadAllowed).ToString());
                 history.Data.Add("CustomFormatScore", message.Album.CustomFormatScore.ToString());
                 history.Data.Add("ReleaseSource", message.Album.ReleaseSource.ToString());
diff --git a/src/NzbDrone.Core/ImportLists/ImportListRepository.cs b/src/NzbDrone.Core/ImportLists/ImportListRepository.cs
index 3471d39a0..9ef65464b 100644
--- a/src/NzbDrone.Core/ImportLists/ImportListRepository.cs
+++ b/src/NzbDrone.Core/ImportLists/ImportListRepository.cs
@@ -1,3 +1,4 @@
+using NLog;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.ThingiProvider;
@@ -11,8 +12,10 @@ namespace NzbDrone.Core.ImportLists
 
     public class ImportListRepository : ProviderRepository<ImportListDefinition>, IImportListRepository
     {
-        public ImportListRepository(IMainDatabase database, IEventAggregator eventAggregator)
-            : base(database, eventAggregator)
+        public ImportListRepository(IMainDatabase database,
+                                    IEventAggregator eventAggregator,
+                                    Logger logger)
+        : base(database, eventAggregator, logger)
         {
         }
 
diff --git a/src/NzbDrone.Core/Indexers/DownloadProtocol.cs b/src/NzbDrone.Core/Indexers/DownloadProtocol.cs
index 470603d2e..3653cf3b5 100644
--- a/src/NzbDrone.Core/Indexers/DownloadProtocol.cs
+++ b/src/NzbDrone.Core/Indexers/DownloadProtocol.cs
@@ -1,9 +1,14 @@
 namespace NzbDrone.Core.Indexers
 {
-    public enum DownloadProtocol
+    public interface IDownloadProtocol
+    {
+    }
+
+    public class UsenetDownloadProtocol : IDownloadProtocol
+    {
+    }
+
+    public class TorrentDownloadProtocol : IDownloadProtocol
     {
-        Unknown = 0,
-        Usenet = 1,
-        Torrent = 2
     }
 }
diff --git a/src/NzbDrone.Core/Indexers/FileList/FileList.cs b/src/NzbDrone.Core/Indexers/FileList/FileList.cs
index bb0da183d..1e9795e82 100644
--- a/src/NzbDrone.Core/Indexers/FileList/FileList.cs
+++ b/src/NzbDrone.Core/Indexers/FileList/FileList.cs
@@ -8,7 +8,7 @@ namespace NzbDrone.Core.Indexers.FileList
     public class FileList : HttpIndexerBase<FileListSettings>
     {
         public override string Name => "FileList";
-        public override DownloadProtocol Protocol => DownloadProtocol.Torrent;
+        public override string Protocol => nameof(TorrentDownloadProtocol);
         public override bool SupportsRss => true;
         public override bool SupportsSearch => true;
 
diff --git a/src/NzbDrone.Core/Indexers/Gazelle/Gazelle.cs b/src/NzbDrone.Core/Indexers/Gazelle/Gazelle.cs
index dac760cb7..1589441dc 100644
--- a/src/NzbDrone.Core/Indexers/Gazelle/Gazelle.cs
+++ b/src/NzbDrone.Core/Indexers/Gazelle/Gazelle.cs
@@ -16,7 +16,7 @@ namespace NzbDrone.Core.Indexers.Gazelle
     public class Gazelle : HttpIndexerBase<GazelleSettings>
     {
         public override string Name => "Gazelle API";
-        public override DownloadProtocol Protocol => DownloadProtocol.Torrent;
+        public override string Protocol => nameof(TorrentDownloadProtocol);
         public override bool SupportsRss => true;
         public override bool SupportsSearch => true;
         public override int PageSize => 50;
@@ -81,7 +81,7 @@ namespace NzbDrone.Core.Indexers.Gazelle
                 Name = name,
                 Implementation = GetType().Name,
                 Settings = settings,
-                Protocol = DownloadProtocol.Torrent,
+                Protocol = nameof(TorrentDownloadProtocol),
                 SupportsRss = SupportsRss,
                 SupportsSearch = SupportsSearch
             };
diff --git a/src/NzbDrone.Core/Indexers/Headphones/Headphones.cs b/src/NzbDrone.Core/Indexers/Headphones/Headphones.cs
index b315b371e..148164d20 100644
--- a/src/NzbDrone.Core/Indexers/Headphones/Headphones.cs
+++ b/src/NzbDrone.Core/Indexers/Headphones/Headphones.cs
@@ -18,7 +18,7 @@ namespace NzbDrone.Core.Indexers.Headphones
 
         public override string Name => "Headphones VIP";
 
-        public override DownloadProtocol Protocol => DownloadProtocol.Usenet;
+        public override string Protocol => nameof(UsenetDownloadProtocol);
 
         public override int PageSize => _capabilitiesProvider.GetCapabilities(Settings).DefaultPageSize;
 
diff --git a/src/NzbDrone.Core/Indexers/IIndexer.cs b/src/NzbDrone.Core/Indexers/IIndexer.cs
index fef7a6284..27bdad127 100644
--- a/src/NzbDrone.Core/Indexers/IIndexer.cs
+++ b/src/NzbDrone.Core/Indexers/IIndexer.cs
@@ -11,7 +11,7 @@ namespace NzbDrone.Core.Indexers
     {
         bool SupportsRss { get; }
         bool SupportsSearch { get; }
-        DownloadProtocol Protocol { get; }
+        string Protocol { get; }
 
         Task<IList<ReleaseInfo>> FetchRecent();
         Task<IList<ReleaseInfo>> Fetch(AlbumSearchCriteria searchCriteria);
diff --git a/src/NzbDrone.Core/Indexers/IPTorrents/IPTorrents.cs b/src/NzbDrone.Core/Indexers/IPTorrents/IPTorrents.cs
index 6b74949ba..bd178c62f 100644
--- a/src/NzbDrone.Core/Indexers/IPTorrents/IPTorrents.cs
+++ b/src/NzbDrone.Core/Indexers/IPTorrents/IPTorrents.cs
@@ -9,7 +9,7 @@ namespace NzbDrone.Core.Indexers.IPTorrents
     {
         public override string Name => "IP Torrents";
 
-        public override DownloadProtocol Protocol => DownloadProtocol.Torrent;
+        public override string Protocol => nameof(TorrentDownloadProtocol);
         public override bool SupportsSearch => false;
         public override int PageSize => 0;
 
diff --git a/src/NzbDrone.Core/Indexers/IndexerBase.cs b/src/NzbDrone.Core/Indexers/IndexerBase.cs
index 20374fd76..fce25aa62 100644
--- a/src/NzbDrone.Core/Indexers/IndexerBase.cs
+++ b/src/NzbDrone.Core/Indexers/IndexerBase.cs
@@ -22,7 +22,7 @@ namespace NzbDrone.Core.Indexers
         protected readonly Logger _logger;
 
         public abstract string Name { get; }
-        public abstract DownloadProtocol Protocol { get; }
+        public abstract string Protocol { get; }
         public int Priority { get; set; }
 
         public abstract bool SupportsRss { get; }
diff --git a/src/NzbDrone.Core/Indexers/IndexerDefinition.cs b/src/NzbDrone.Core/Indexers/IndexerDefinition.cs
index 50bea595b..e93382234 100644
--- a/src/NzbDrone.Core/Indexers/IndexerDefinition.cs
+++ b/src/NzbDrone.Core/Indexers/IndexerDefinition.cs
@@ -15,7 +15,7 @@ namespace NzbDrone.Core.Indexers
         public bool EnableAutomaticSearch { get; set; }
         public bool EnableInteractiveSearch { get; set; }
         public int DownloadClientId { get; set; }
-        public DownloadProtocol Protocol { get; set; }
+        public string Protocol { get; set; }
         public bool SupportsRss { get; set; }
         public bool SupportsSearch { get; set; }
         public int Priority { get; set; }
diff --git a/src/NzbDrone.Core/Indexers/IndexerRepository.cs b/src/NzbDrone.Core/Indexers/IndexerRepository.cs
index c4858f415..92478f273 100644
--- a/src/NzbDrone.Core/Indexers/IndexerRepository.cs
+++ b/src/NzbDrone.Core/Indexers/IndexerRepository.cs
@@ -1,4 +1,5 @@
-using NzbDrone.Core.Datastore;
+using NLog;
+using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.ThingiProvider;
 
@@ -10,8 +11,10 @@ namespace NzbDrone.Core.Indexers
 
     public class IndexerRepository : ProviderRepository<IndexerDefinition>, IIndexerRepository
     {
-        public IndexerRepository(IMainDatabase database, IEventAggregator eventAggregator)
-            : base(database, eventAggregator)
+        public IndexerRepository(IMainDatabase database,
+                                 IEventAggregator eventAggregator,
+                                 Logger logger)
+        : base(database, eventAggregator, logger)
         {
         }
     }
diff --git a/src/NzbDrone.Core/Indexers/Newznab/Newznab.cs b/src/NzbDrone.Core/Indexers/Newznab/Newznab.cs
index 57881c48c..937d6679b 100644
--- a/src/NzbDrone.Core/Indexers/Newznab/Newznab.cs
+++ b/src/NzbDrone.Core/Indexers/Newznab/Newznab.cs
@@ -19,7 +19,7 @@ namespace NzbDrone.Core.Indexers.Newznab
 
         public override string Name => "Newznab";
 
-        public override DownloadProtocol Protocol => DownloadProtocol.Usenet;
+        public override string Protocol => nameof(UsenetDownloadProtocol);
         public override int PageSize => GetProviderPageSize();
 
         public Newznab(INewznabCapabilitiesProvider capabilitiesProvider, IHttpClient httpClient, IIndexerStatusService indexerStatusService, IConfigService configService, IParsingService parsingService, Logger logger)
@@ -69,7 +69,7 @@ namespace NzbDrone.Core.Indexers.Newznab
                 Name = name,
                 Implementation = GetType().Name,
                 Settings = settings,
-                Protocol = DownloadProtocol.Usenet,
+                Protocol = nameof(UsenetDownloadProtocol),
                 SupportsRss = SupportsRss,
                 SupportsSearch = SupportsSearch
             };
diff --git a/src/NzbDrone.Core/Indexers/Nyaa/Nyaa.cs b/src/NzbDrone.Core/Indexers/Nyaa/Nyaa.cs
index 70d328572..cb944541d 100644
--- a/src/NzbDrone.Core/Indexers/Nyaa/Nyaa.cs
+++ b/src/NzbDrone.Core/Indexers/Nyaa/Nyaa.cs
@@ -9,7 +9,7 @@ namespace NzbDrone.Core.Indexers.Nyaa
     {
         public override string Name => "Nyaa";
 
-        public override DownloadProtocol Protocol => DownloadProtocol.Torrent;
+        public override string Protocol => nameof(TorrentDownloadProtocol);
 
         public Nyaa(IHttpClient httpClient, IIndexerStatusService indexerStatusService, IConfigService configService, IParsingService parsingService, Logger logger)
             : base(httpClient, indexerStatusService, configService, parsingService, logger)
diff --git a/src/NzbDrone.Core/Indexers/Redacted/Redacted.cs b/src/NzbDrone.Core/Indexers/Redacted/Redacted.cs
index 871e0f8bb..41fce7716 100644
--- a/src/NzbDrone.Core/Indexers/Redacted/Redacted.cs
+++ b/src/NzbDrone.Core/Indexers/Redacted/Redacted.cs
@@ -12,7 +12,7 @@ namespace NzbDrone.Core.Indexers.Redacted
     public class Redacted : HttpIndexerBase<RedactedSettings>
     {
         public override string Name => "Redacted.ch";
-        public override DownloadProtocol Protocol => DownloadProtocol.Torrent;
+        public override string Protocol => nameof(TorrentDownloadProtocol);
         public override bool SupportsRss => true;
         public override bool SupportsSearch => true;
         public override int PageSize => 50;
diff --git a/src/NzbDrone.Core/Indexers/SeedConfigProvider.cs b/src/NzbDrone.Core/Indexers/SeedConfigProvider.cs
index f05ce544a..0259524a4 100644
--- a/src/NzbDrone.Core/Indexers/SeedConfigProvider.cs
+++ b/src/NzbDrone.Core/Indexers/SeedConfigProvider.cs
@@ -27,7 +27,7 @@ namespace NzbDrone.Core.Indexers
 
         public TorrentSeedConfiguration GetSeedConfiguration(RemoteAlbum remoteAlbum)
         {
-            if (remoteAlbum.Release.DownloadProtocol != DownloadProtocol.Torrent)
+            if (remoteAlbum.Release.DownloadProtocol != nameof(TorrentDownloadProtocol))
             {
                 return null;
             }
diff --git a/src/NzbDrone.Core/Indexers/TorrentRss/TorrentRssIndexer.cs b/src/NzbDrone.Core/Indexers/TorrentRss/TorrentRssIndexer.cs
index 5f467807a..a43229416 100644
--- a/src/NzbDrone.Core/Indexers/TorrentRss/TorrentRssIndexer.cs
+++ b/src/NzbDrone.Core/Indexers/TorrentRss/TorrentRssIndexer.cs
@@ -9,7 +9,7 @@ namespace NzbDrone.Core.Indexers.TorrentRss
     {
         public override string Name => "Torrent RSS Feed";
 
-        public override DownloadProtocol Protocol => DownloadProtocol.Torrent;
+        public override string Protocol => nameof(TorrentDownloadProtocol);
         public override bool SupportsSearch => false;
         public override int PageSize => 0;
 
diff --git a/src/NzbDrone.Core/Indexers/Torrentleech/Torrentleech.cs b/src/NzbDrone.Core/Indexers/Torrentleech/Torrentleech.cs
index fc3a46bc2..831515c09 100644
--- a/src/NzbDrone.Core/Indexers/Torrentleech/Torrentleech.cs
+++ b/src/NzbDrone.Core/Indexers/Torrentleech/Torrentleech.cs
@@ -9,7 +9,7 @@ namespace NzbDrone.Core.Indexers.Torrentleech
     {
         public override string Name => "TorrentLeech";
 
-        public override DownloadProtocol Protocol => DownloadProtocol.Torrent;
+        public override string Protocol => nameof(TorrentDownloadProtocol);
         public override bool SupportsSearch => false;
         public override int PageSize => 0;
 
diff --git a/src/NzbDrone.Core/Indexers/Torznab/Torznab.cs b/src/NzbDrone.Core/Indexers/Torznab/Torznab.cs
index 0b21765cb..3ff1329d3 100644
--- a/src/NzbDrone.Core/Indexers/Torznab/Torznab.cs
+++ b/src/NzbDrone.Core/Indexers/Torznab/Torznab.cs
@@ -19,7 +19,7 @@ namespace NzbDrone.Core.Indexers.Torznab
 
         public override string Name => "Torznab";
 
-        public override DownloadProtocol Protocol => DownloadProtocol.Torrent;
+        public override string Protocol => nameof(TorrentDownloadProtocol);
         public override int PageSize => GetProviderPageSize();
 
         public Torznab(INewznabCapabilitiesProvider capabilitiesProvider, IHttpClient httpClient, IIndexerStatusService indexerStatusService, IConfigService configService, IParsingService parsingService, Logger logger)
@@ -52,7 +52,7 @@ namespace NzbDrone.Core.Indexers.Torznab
                 Name = name,
                 Implementation = GetType().Name,
                 Settings = settings,
-                Protocol = DownloadProtocol.Usenet,
+                Protocol = nameof(UsenetDownloadProtocol),
                 SupportsRss = SupportsRss,
                 SupportsSearch = SupportsSearch
             };
diff --git a/src/NzbDrone.Core/Lidarr.Core.csproj b/src/NzbDrone.Core/Lidarr.Core.csproj
index b96f564c9..f417f9446 100644
--- a/src/NzbDrone.Core/Lidarr.Core.csproj
+++ b/src/NzbDrone.Core/Lidarr.Core.csproj
@@ -30,7 +30,10 @@
     <PackageReference Include="MonoTorrent" Version="2.0.7" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\NzbDrone.Common\Lidarr.Common.csproj" />
+    <ProjectReference Include="..\NzbDrone.Common\Lidarr.Common.csproj">
+      <Private>false</Private>
+      <ExcludeAssets>runtime</ExcludeAssets>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Content Include="Localization\Core\**">
diff --git a/src/NzbDrone.Core/Notifications/NotificationRepository.cs b/src/NzbDrone.Core/Notifications/NotificationRepository.cs
index 96ff55b52..d406eb716 100644
--- a/src/NzbDrone.Core/Notifications/NotificationRepository.cs
+++ b/src/NzbDrone.Core/Notifications/NotificationRepository.cs
@@ -1,3 +1,4 @@
+using NLog;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.ThingiProvider;
@@ -11,8 +12,10 @@ namespace NzbDrone.Core.Notifications
 
     public class NotificationRepository : ProviderRepository<NotificationDefinition>, INotificationRepository
     {
-        public NotificationRepository(IMainDatabase database, IEventAggregator eventAggregator)
-            : base(database, eventAggregator)
+        public NotificationRepository(IMainDatabase database,
+                                      IEventAggregator eventAggregator,
+                                      Logger logger)
+        : base(database, eventAggregator, logger)
         {
         }
 
diff --git a/src/NzbDrone.Core/Parser/Model/ReleaseInfo.cs b/src/NzbDrone.Core/Parser/Model/ReleaseInfo.cs
index f0dad6c66..325c1e8ea 100644
--- a/src/NzbDrone.Core/Parser/Model/ReleaseInfo.cs
+++ b/src/NzbDrone.Core/Parser/Model/ReleaseInfo.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Text;
 using System.Text.Json.Serialization;
 using NzbDrone.Core.Download.Pending;
-using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Languages;
 
 namespace NzbDrone.Core.Parser.Model
@@ -26,7 +25,7 @@ namespace NzbDrone.Core.Parser.Model
         public string Artist { get; set; }
         public string Album { get; set; }
         public int IndexerPriority { get; set; }
-        public DownloadProtocol DownloadProtocol { get; set; }
+        public string DownloadProtocol { get; set; }
         public DateTime PublishDate { get; set; }
 
         public string Origin { get; set; }
diff --git a/src/NzbDrone.Core/Plugins/Commands/InstallPluginCommand.cs b/src/NzbDrone.Core/Plugins/Commands/InstallPluginCommand.cs
new file mode 100644
index 000000000..f1c3517ea
--- /dev/null
+++ b/src/NzbDrone.Core/Plugins/Commands/InstallPluginCommand.cs
@@ -0,0 +1,13 @@
+using NzbDrone.Core.Messaging.Commands;
+
+namespace NzbDrone.Core.Plugins.Commands
+{
+    public class InstallPluginCommand : Command
+    {
+        public string GithubUrl { get; set; }
+
+        public override bool SendUpdatesToClient => true;
+        public override bool IsExclusive => true;
+        public override string CompletionMessage => null;
+    }
+}
diff --git a/src/NzbDrone.Core/Plugins/Commands/UninstallPluginCommand.cs b/src/NzbDrone.Core/Plugins/Commands/UninstallPluginCommand.cs
new file mode 100644
index 000000000..15658c7ce
--- /dev/null
+++ b/src/NzbDrone.Core/Plugins/Commands/UninstallPluginCommand.cs
@@ -0,0 +1,13 @@
+using NzbDrone.Core.Messaging.Commands;
+
+namespace NzbDrone.Core.Plugins.Commands
+{
+    public class UninstallPluginCommand : Command
+    {
+        public string GithubUrl { get; set; }
+
+        public override bool SendUpdatesToClient => true;
+        public override bool IsExclusive => true;
+        public override string CompletionMessage => null;
+    }
+}
diff --git a/src/NzbDrone.Core/Plugins/InstallPluginService.cs b/src/NzbDrone.Core/Plugins/InstallPluginService.cs
new file mode 100644
index 000000000..bbce68259
--- /dev/null
+++ b/src/NzbDrone.Core/Plugins/InstallPluginService.cs
@@ -0,0 +1,105 @@
+using System.IO;
+using System.Threading.Tasks;
+using NLog;
+using NzbDrone.Common;
+using NzbDrone.Common.Disk;
+using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Common.Extensions;
+using NzbDrone.Common.Http;
+using NzbDrone.Common.Instrumentation.Extensions;
+using NzbDrone.Core.Lifecycle;
+using NzbDrone.Core.Messaging.Commands;
+using NzbDrone.Core.Plugins.Commands;
+
+namespace NzbDrone.Core.Plugins
+{
+    public class InstallPluginService : IExecute<InstallPluginCommand>, IExecute<UninstallPluginCommand>
+    {
+        private readonly IPluginService _pluginService;
+        private readonly IDiskProvider _diskProvider;
+        private readonly IAppFolderInfo _appFolderInfo;
+        private readonly IHttpClient _httpClient;
+        private readonly IArchiveService _archiveService;
+        private readonly ILifecycleService _lifecycleService;
+        private readonly Logger _logger;
+
+        public InstallPluginService(IPluginService pluginService,
+                                    IDiskProvider diskProvider,
+                                    IAppFolderInfo appFolderInfo,
+                                    IHttpClient httpClient,
+                                    IArchiveService archiveService,
+                                    ILifecycleService lifecycleService,
+                                    Logger logger)
+        {
+            _pluginService = pluginService;
+            _diskProvider = diskProvider;
+            _appFolderInfo = appFolderInfo;
+            _httpClient = httpClient;
+            _archiveService = archiveService;
+            _lifecycleService = lifecycleService;
+            _logger = logger;
+        }
+
+        public void Execute(UninstallPluginCommand message)
+        {
+            var (owner, name) = _pluginService.ParseUrl(message.GithubUrl);
+            UninstallPlugin(owner, name);
+        }
+
+        public void Execute(InstallPluginCommand message)
+        {
+            var package = _pluginService.GetRemotePlugin(message.GithubUrl);
+            if (package != null)
+            {
+                InstallPlugin(package);
+            }
+        }
+
+        private void InstallPlugin(RemotePlugin package)
+        {
+            EnsurePluginFolder();
+
+            var tempFolder = TempFolder();
+            if (_diskProvider.FolderExists(tempFolder))
+            {
+                _logger.Info("Deleting old plugin packages");
+                _diskProvider.DeleteFolder(tempFolder, true);
+            }
+
+            var packageDestination = Path.Combine(tempFolder, $"{package.Name}.zip");
+
+            _logger.ProgressInfo($"Downloading plugin {package.Name}");
+            _httpClient.DownloadFile(package.PackageUrl, packageDestination);
+
+            _logger.ProgressInfo("Extracting Plugin package");
+            _archiveService.Extract(packageDestination, Path.Combine(PluginFolder(), package.Owner, package.Name));
+            _logger.ProgressInfo($"Installed {package.Name}, restarting");
+
+            Task.Factory.StartNew(() => _lifecycleService.Restart());
+        }
+
+        private void UninstallPlugin(string owner, string name)
+        {
+            _logger.ProgressInfo($"Uninstalling Plugin {owner}/{name}");
+            _diskProvider.DeleteFolder(Path.Combine(PluginFolder(), owner, name), true);
+            _logger.ProgressInfo($"Uninstalled Plugin {owner}/{name}, restarting");
+
+            Task.Factory.StartNew(() => _lifecycleService.Restart());
+        }
+
+        private void EnsurePluginFolder()
+        {
+            _diskProvider.EnsureFolder(PluginFolder());
+        }
+
+        private string PluginFolder()
+        {
+            return _appFolderInfo.GetPluginPath();
+        }
+
+        private string TempFolder()
+        {
+            return Path.Combine(_appFolderInfo.TempFolder, "plugins");
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/Plugins/Plugin.cs b/src/NzbDrone.Core/Plugins/Plugin.cs
new file mode 100644
index 000000000..5184b6069
--- /dev/null
+++ b/src/NzbDrone.Core/Plugins/Plugin.cs
@@ -0,0 +1,32 @@
+using System;
+
+namespace NzbDrone.Core.Plugins
+{
+    public interface IPlugin
+    {
+        string Name { get; }
+        string Owner { get; }
+        string GithubUrl { get; }
+        Version InstalledVersion { get; }
+        Version AvailableVersion { get; set; }
+    }
+
+    public abstract class Plugin : IPlugin
+    {
+        public virtual string Name { get; }
+        public virtual string Owner { get; }
+        public virtual string GithubUrl { get; }
+
+        public Version InstalledVersion => GetType().Assembly.GetName().Version;
+        public Version AvailableVersion { get; set; }
+    }
+
+    public class RemotePlugin
+    {
+        public string Name { get; set; }
+        public string Owner { get; set; }
+        public string GithubUrl { get; set; }
+        public Version Version { get; set; }
+        public string PackageUrl { get; set; }
+    }
+}
diff --git a/src/NzbDrone.Core/Plugins/PluginService.cs b/src/NzbDrone.Core/Plugins/PluginService.cs
new file mode 100644
index 000000000..3c73c81d1
--- /dev/null
+++ b/src/NzbDrone.Core/Plugins/PluginService.cs
@@ -0,0 +1,117 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+using NLog;
+using NzbDrone.Common.EnvironmentInfo;
+using NzbDrone.Common.Http;
+using NzbDrone.Core.Plugins.Resources;
+
+namespace NzbDrone.Core.Plugins
+{
+    public interface IPluginService
+    {
+        (string, string) ParseUrl(string repoUrl);
+        RemotePlugin GetRemotePlugin(string repoUrl);
+        List<IPlugin> GetInstalledPlugins();
+    }
+
+    public class PluginService : IPluginService
+    {
+        private static readonly Regex RepoRegex = new Regex(@"https://github.com/(?<owner>[^/]*)/(?<name>[^/]*)", RegexOptions.Compiled);
+        private static readonly Regex MinVersionRegex = new Regex(@"Minimum Lidarr Version: (?<version>\d+\.\d+\.\d+\.\d+)", RegexOptions.Compiled);
+
+        private readonly IHttpClient _httpClient;
+        private readonly List<IPlugin> _installedPlugins;
+        private readonly Logger _logger;
+
+        public PluginService(IHttpClient httpClient,
+                             IEnumerable<IPlugin> installedPlugins,
+                             Logger logger)
+        {
+            _httpClient = httpClient;
+            _installedPlugins = installedPlugins.ToList();
+            _logger = logger;
+        }
+
+        public (string, string) ParseUrl(string repoUrl)
+        {
+            var match = RepoRegex.Match(repoUrl);
+
+            if (!match.Success)
+            {
+                _logger.Warn("Invalid plugin repo URL");
+                return (null, null);
+            }
+
+            var owner = match.Groups["owner"].Value;
+            var name = match.Groups["name"].Value;
+
+            return (owner, name);
+        }
+
+        public RemotePlugin GetRemotePlugin(string repoUrl)
+        {
+            var (owner, name) = ParseUrl(repoUrl);
+            var releaseUrl = $"https://api.github.com/repos/{owner}/{name}/releases";
+
+            var releases = _httpClient.Get<List<Release>>(new HttpRequest(releaseUrl)).Resource;
+
+            if (!releases?.Any() ?? true)
+            {
+                _logger.Warn($"No releases found for {name}");
+                return null;
+            }
+
+            var latest = releases.OrderByDescending(x => x.PublishedAt).FirstOrDefault(x => IsSupported(x));
+
+            if (latest == null)
+            {
+                _logger.Warn($"Plugin {name} requires newer version of Lidarr");
+                return null;
+            }
+
+            var version = Version.Parse(latest.TagName.TrimStart('v'));
+            var framework = "net6.0";
+            var asset = latest.Assets.FirstOrDefault(x => x.Name.EndsWith($"{framework}.zip"));
+
+            if (asset == null)
+            {
+                _logger.Warn($"No plugin package found for {framework} for {name}");
+                return null;
+            }
+
+            return new RemotePlugin
+            {
+                GithubUrl = repoUrl,
+                Name = name,
+                Owner = owner,
+                Version = version,
+                PackageUrl = asset.BrowserDownloadUrl
+            };
+        }
+
+        public List<IPlugin> GetInstalledPlugins()
+        {
+            foreach (var plugin in _installedPlugins)
+            {
+                var remote = GetRemotePlugin(plugin.GithubUrl);
+                plugin.AvailableVersion = remote.Version;
+            }
+
+            return _installedPlugins;
+        }
+
+        private bool IsSupported(Release release)
+        {
+            var match = MinVersionRegex.Match(release.Body);
+            if (match.Success)
+            {
+                var minVersion = Version.Parse(match.Groups["version"].Value);
+                return minVersion <= BuildInfo.Version;
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/Plugins/Resources/GithubRelease.cs b/src/NzbDrone.Core/Plugins/Resources/GithubRelease.cs
new file mode 100644
index 000000000..cde5b17b2
--- /dev/null
+++ b/src/NzbDrone.Core/Plugins/Resources/GithubRelease.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace NzbDrone.Core.Plugins.Resources
+{
+    public class Asset
+    {
+        public string Url { get; set; }
+        public int Id { get; set; }
+        public string NodeId { get; set; }
+        public string Name { get; set; }
+        public string Label { get; set; }
+        [JsonProperty("content_type")]
+        public string ContentType { get; set; }
+        public string State { get; set; }
+        public int Size { get; set; }
+        [JsonProperty("download_count")]
+        public int DownloadCount { get; set; }
+        [JsonProperty("created_at")]
+        public DateTime CreatedAt { get; set; }
+        [JsonProperty("updated_at")]
+        public DateTime UpdatedAt { get; set; }
+        [JsonProperty("browser_download_url")]
+        public string BrowserDownloadUrl { get; set; }
+    }
+
+    public class Release
+    {
+        public string Url { get; set; }
+        [JsonProperty("assets_url")]
+        public string AssetsUrl { get; set; }
+        [JsonProperty("upload_url")]
+        public string UploadUrl { get; set; }
+        [JsonProperty("html_url")]
+        public string HtmlUrl { get; set; }
+        public int Id { get; set; }
+        [JsonProperty("node_id")]
+        public string NodeId { get; set; }
+        [JsonProperty("tag_name")]
+        public string TagName { get; set; }
+        [JsonProperty("target_commitish")]
+        public string TargetCommitish { get; set; }
+        public string Name { get; set; }
+        public bool Draft { get; set; }
+        public bool Prerelease { get; set; }
+        [JsonProperty("created_at")]
+        public DateTime CreatedAt { get; set; }
+        [JsonProperty("published_at")]
+        public DateTime PublishedAt { get; set; }
+        public List<Asset> Assets { get; set; } = new List<Asset>();
+        [JsonProperty("tarball_url")]
+        public string TarballUrl { get; set; }
+        [JsonProperty("zipball_url")]
+        public string ZipballUrl { get; set; }
+        public string Body { get; set; }
+    }
+}
diff --git a/src/NzbDrone.Core/Profiles/Delay/DelayProfile.cs b/src/NzbDrone.Core/Profiles/Delay/DelayProfile.cs
index 928d5fdbc..1c48b5b29 100644
--- a/src/NzbDrone.Core/Profiles/Delay/DelayProfile.cs
+++ b/src/NzbDrone.Core/Profiles/Delay/DelayProfile.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Indexers;
 
@@ -6,11 +7,8 @@ namespace NzbDrone.Core.Profiles.Delay
 {
     public class DelayProfile : ModelBase
     {
-        public bool EnableUsenet { get; set; }
-        public bool EnableTorrent { get; set; }
-        public DownloadProtocol PreferredProtocol { get; set; }
-        public int UsenetDelay { get; set; }
-        public int TorrentDelay { get; set; }
+        public string Name { get; set; }
+        public List<DelayProfileProtocolItem> Items { get; set; }
         public int Order { get; set; }
         public bool BypassIfHighestQuality { get; set; }
         public bool BypassIfAboveCustomFormatScore { get; set; }
@@ -19,12 +17,38 @@ namespace NzbDrone.Core.Profiles.Delay
 
         public DelayProfile()
         {
+            Items = new List<DelayProfileProtocolItem>
+            {
+                new DelayProfileProtocolItem
+                {
+                    Name = "Usenet",
+                    Protocol = nameof(UsenetDownloadProtocol),
+                    Allowed = true
+                },
+                new DelayProfileProtocolItem
+                {
+                    Name = "Torrent",
+                    Protocol = nameof(TorrentDownloadProtocol),
+                    Allowed = true
+                }
+            };
+
             Tags = new HashSet<int>();
         }
 
-        public int GetProtocolDelay(DownloadProtocol protocol)
+        public bool IsPreferredProtocol(string protocol)
+        {
+            return Items.First().Protocol == protocol;
+        }
+
+        public bool IsAllowedProtocol(string protocol)
+        {
+            return Items.FirstOrDefault(x => x.Protocol == protocol)?.Allowed ?? false;
+        }
+
+        public int GetProtocolDelay(string protocol)
         {
-            return protocol == DownloadProtocol.Torrent ? TorrentDelay : UsenetDelay;
+            return Items.SingleOrDefault(x => x.Protocol == protocol)?.Delay ?? 0;
         }
     }
 }
diff --git a/src/NzbDrone.Core/Profiles/Delay/DelayProfileProtocolItem.cs b/src/NzbDrone.Core/Profiles/Delay/DelayProfileProtocolItem.cs
new file mode 100644
index 000000000..c706d387c
--- /dev/null
+++ b/src/NzbDrone.Core/Profiles/Delay/DelayProfileProtocolItem.cs
@@ -0,0 +1,12 @@
+using NzbDrone.Core.Datastore;
+
+namespace NzbDrone.Core.Profiles.Delay
+{
+    public class DelayProfileProtocolItem : IEmbeddedDocument
+    {
+        public string Name { get; set; }
+        public string Protocol { get; set; }
+        public bool Allowed { get; set; }
+        public int Delay { get; set; }
+    }
+}
diff --git a/src/NzbDrone.Core/Profiles/Delay/DelayProfileService.cs b/src/NzbDrone.Core/Profiles/Delay/DelayProfileService.cs
index f8a94ff26..af948ad2c 100644
--- a/src/NzbDrone.Core/Profiles/Delay/DelayProfileService.cs
+++ b/src/NzbDrone.Core/Profiles/Delay/DelayProfileService.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using NzbDrone.Common.Cache;
 using NzbDrone.Common.Extensions;
+using NzbDrone.Core.Indexers;
 
 namespace NzbDrone.Core.Profiles.Delay
 {
@@ -13,6 +14,7 @@ namespace NzbDrone.Core.Profiles.Delay
         void Delete(int id);
         List<DelayProfile> All();
         DelayProfile Get(int id);
+        DelayProfile GetDefaultProfile();
         List<DelayProfile> AllForTag(int tagId);
         List<DelayProfile> AllForTags(HashSet<int> tagIds);
         DelayProfile BestForTags(HashSet<int> tagIds);
@@ -23,10 +25,14 @@ namespace NzbDrone.Core.Profiles.Delay
     {
         private readonly IDelayProfileRepository _repo;
         private readonly ICached<DelayProfile> _bestForTagsCache;
+        private readonly List<IDownloadProtocol> _downloadProtocols;
 
-        public DelayProfileService(IDelayProfileRepository repo, ICacheManager cacheManager)
+        public DelayProfileService(IDelayProfileRepository repo,
+                                   IEnumerable<IDownloadProtocol> downloadProtocols,
+                                   ICacheManager cacheManager)
         {
             _repo = repo;
+            _downloadProtocols = downloadProtocols.ToList();
             _bestForTagsCache = cacheManager.GetCache<DelayProfile>(GetType(), "best");
         }
 
@@ -69,12 +75,24 @@ namespace NzbDrone.Core.Profiles.Delay
 
         public List<DelayProfile> All()
         {
-            return _repo.All().ToList();
+            return _repo.All().Select(x => AddMissingItems(x)).ToList();
         }
 
         public DelayProfile Get(int id)
         {
-            return _repo.Get(id);
+            return AddMissingItems(_repo.Get(id));
+        }
+
+        public DelayProfile GetDefaultProfile()
+        {
+            var standardTypes = new[] { typeof(UsenetDownloadProtocol), typeof(TorrentDownloadProtocol) };
+
+            var others = _downloadProtocols.Where(x => !standardTypes.Contains(x.GetType())).OrderBy(x => x.GetType().Name);
+
+            var result = new DelayProfile();
+            result.Items.AddRange(others.Select(x => GetProtocolItem(x, true)));
+
+            return result;
         }
 
         public List<DelayProfile> AllForTag(int tagId)
@@ -96,7 +114,7 @@ namespace NzbDrone.Core.Profiles.Delay
 
         private DelayProfile FetchBestForTags(HashSet<int> tagIds)
         {
-            return _repo.All()
+            return All()
                 .Where(r => r.Tags.Intersect(tagIds).Any() || r.Tags.Empty())
                 .OrderBy(d => d.Order).First();
         }
@@ -164,5 +182,25 @@ namespace NzbDrone.Core.Profiles.Delay
 
             return after.Order;
         }
+
+        private DelayProfile AddMissingItems(DelayProfile profile)
+        {
+            var missing = _downloadProtocols.Where(x => !profile.Items.Any(i => i.Protocol == x.GetType().Name));
+            profile.Items.AddRange(missing.Select(x => GetProtocolItem(x, false)));
+
+            var protocolNames = _downloadProtocols.Select(x => x.GetType().Name).ToList();
+            profile.Items.RemoveAll(x => !protocolNames.Contains(x.Protocol));
+            return profile;
+        }
+
+        private DelayProfileProtocolItem GetProtocolItem(IDownloadProtocol protocol, bool allowed)
+        {
+            return new DelayProfileProtocolItem
+            {
+                Name = protocol.GetType().Name.Replace("DownloadProtocol", ""),
+                Protocol = protocol.GetType().Name,
+                Allowed = allowed
+            };
+        }
     }
 }
diff --git a/src/NzbDrone.Core/Queue/Queue.cs b/src/NzbDrone.Core/Queue/Queue.cs
index d05d03947..bdb81a586 100644
--- a/src/NzbDrone.Core/Queue/Queue.cs
+++ b/src/NzbDrone.Core/Queue/Queue.cs
@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Download.TrackedDownloads;
-using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Music;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Qualities;
@@ -26,7 +25,7 @@ namespace NzbDrone.Core.Queue
         public List<TrackedDownloadStatusMessage> StatusMessages { get; set; }
         public string DownloadId { get; set; }
         public RemoteAlbum RemoteAlbum { get; set; }
-        public DownloadProtocol Protocol { get; set; }
+        public string Protocol { get; set; }
         public string DownloadClient { get; set; }
         public bool DownloadClientHasPostImportCategory { get; set; }
         public string Indexer { get; set; }
diff --git a/src/NzbDrone.Core/ThingiProvider/ProviderRepository.cs b/src/NzbDrone.Core/ThingiProvider/ProviderRepository.cs
index d814d79c4..dfc0e1964 100644
--- a/src/NzbDrone.Core/ThingiProvider/ProviderRepository.cs
+++ b/src/NzbDrone.Core/ThingiProvider/ProviderRepository.cs
@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using Dapper;
+using NLog;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Reflection;
 using NzbDrone.Common.Serializer;
@@ -15,10 +16,15 @@ namespace NzbDrone.Core.ThingiProvider
             new()
     {
         protected readonly JsonSerializerOptions _serializerSettings;
+        private readonly Logger _logger;
 
-        protected ProviderRepository(IMainDatabase database, IEventAggregator eventAggregator)
+        protected ProviderRepository(IMainDatabase database,
+                                     IEventAggregator eventAggregator,
+                                     Logger logger)
             : base(database, eventAggregator)
         {
+            _logger = logger;
+
             var serializerSettings = new JsonSerializerOptions
             {
                 AllowTrailingCommas = true,
@@ -53,7 +59,14 @@ namespace NzbDrone.Core.ThingiProvider
                 {
                     var body = reader.IsDBNull(settingsIndex) ? null : reader.GetString(settingsIndex);
                     var item = parser(reader);
-                    var impType = typeof(IProviderConfig).Assembly.FindTypeByName(item.ConfigContract);
+                    var impType = ReflectionExtensions.FindTypeByName(item.ConfigContract);
+
+                    // If the type is missing
+                    if (impType == null)
+                    {
+                        _logger.Warn($"Skipping provider of unknown type {item.ConfigContract}");
+                        continue;
+                    }
 
                     if (body.IsNullOrWhiteSpace() || impType == null)
                     {
diff --git a/src/NzbDrone.Host.Test/ContainerFixture.cs b/src/NzbDrone.Host.Test/ContainerFixture.cs
index b712b57eb..b5247adea 100644
--- a/src/NzbDrone.Host.Test/ContainerFixture.cs
+++ b/src/NzbDrone.Host.Test/ContainerFixture.cs
@@ -9,6 +9,7 @@ using Microsoft.Extensions.Options;
 using Moq;
 using NUnit.Framework;
 using NzbDrone.Common;
+using NzbDrone.Common.Composition;
 using NzbDrone.Common.Composition.Extensions;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Instrumentation.Extensions;
@@ -20,7 +21,6 @@ using NzbDrone.Core.Download.TrackedDownloads;
 using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Messaging.Commands;
 using NzbDrone.Core.Messaging.Events;
-using NzbDrone.Host;
 using NzbDrone.SignalR;
 using NzbDrone.Test.Common;
 using IServiceProvider = System.IServiceProvider;
@@ -37,8 +37,9 @@ namespace NzbDrone.App.Test
         {
             var args = new StartupContext("first", "second");
 
+            var assemblies = AssemblyLoader.LoadBaseAssemblies();
             var container = new Container(rules => rules.WithNzbDroneRules())
-                .AutoAddServices(Bootstrap.ASSEMBLIES)
+                .AutoAddServices(assemblies)
                 .AddNzbDroneLogger()
                 .AddDummyDatabase()
                 .AddStartupContext(args);
diff --git a/src/NzbDrone.Host/Bootstrap.cs b/src/NzbDrone.Host/Bootstrap.cs
index b8843c5a4..63465e2ce 100644
--- a/src/NzbDrone.Host/Bootstrap.cs
+++ b/src/NzbDrone.Host/Bootstrap.cs
@@ -2,7 +2,9 @@ using System;
 using System.Collections.Generic;
 using System.Data.SQLite;
 using System.IO;
+using System.Linq;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
@@ -14,6 +16,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Hosting.WindowsServices;
 using NLog;
+using NzbDrone.Common.Composition;
 using NzbDrone.Common.Composition.Extensions;
 using NzbDrone.Common.Disk;
 using NzbDrone.Common.EnvironmentInfo;
@@ -32,15 +35,6 @@ namespace NzbDrone.Host
     {
         private static readonly Logger Logger = NzbDroneLogger.GetLogger(typeof(Bootstrap));
 
-        public static readonly List<string> ASSEMBLIES = new List<string>
-        {
-            "Lidarr.Host",
-            "Lidarr.Core",
-            "Lidarr.SignalR",
-            "Lidarr.Api.V1",
-            "Lidarr.Http"
-        };
-
         public static void Start(string[] args, Action<IHostBuilder> trayCallback = null)
         {
             try
@@ -60,53 +54,14 @@ namespace NzbDrone.Host
                 switch (appMode)
                 {
                     case ApplicationModes.Service:
-                    {
-                        Logger.Debug("Service selected");
-
-                        CreateConsoleHostBuilder(args, startupContext).UseWindowsService().Build().Run();
+                        StartService(startupContext);
                         break;
-                    }
-
                     case ApplicationModes.Interactive:
-                    {
-                        Logger.Debug(trayCallback != null ? "Tray selected" : "Console selected");
-                        var builder = CreateConsoleHostBuilder(args, startupContext);
-
-                        if (trayCallback != null)
-                        {
-                            trayCallback(builder);
-                        }
-
-                        builder.Build().Run();
+                        StartInteractive(startupContext, trayCallback);
                         break;
-                    }
-
-                    // Utility mode
                     default:
-                    {
-                        new HostBuilder()
-                            .UseServiceProviderFactory(new DryIocServiceProviderFactory(new Container(rules => rules.WithNzbDroneRules())))
-                            .ConfigureContainer<IContainer>(c =>
-                            {
-                                c.AutoAddServices(Bootstrap.ASSEMBLIES)
-                                    .AddNzbDroneLogger()
-                                    .AddDatabase()
-                                    .AddStartupContext(startupContext)
-                                    .Resolve<UtilityModeRouter>()
-                                    .Route(appMode);
-                            })
-                            .ConfigureServices(services =>
-                            {
-                                services.Configure<PostgresOptions>(config.GetSection("Lidarr:Postgres"));
-                                services.Configure<AppOptions>(config.GetSection("Lidarr:App"));
-                                services.Configure<AuthOptions>(config.GetSection("Lidarr:Auth"));
-                                services.Configure<ServerOptions>(config.GetSection("Lidarr:Server"));
-                                services.Configure<LogOptions>(config.GetSection("Lidarr:Log"));
-                                services.Configure<UpdateOptions>(config.GetSection("Lidarr:Update"));
-                            }).Build();
-
+                        StartUtility(startupContext, appMode, config);
                         break;
-                    }
                 }
             }
             catch (InvalidConfigFileException ex)
@@ -129,7 +84,111 @@ namespace NzbDrone.Host
             SQLiteConnection.ClearAllPools();
         }
 
-        public static IHostBuilder CreateConsoleHostBuilder(string[] args, StartupContext context)
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private static void StartService(StartupContext context)
+        {
+            Logger.Debug("Service selected");
+
+            var success = StartService(context, true, out var pluginRefs);
+
+            if (!success)
+            {
+                var unloadSuccess = PluginLoader.UnloadPlugins(pluginRefs);
+
+                if (unloadSuccess)
+                {
+                    StartService(context, false, out _);
+                }
+            }
+
+            CreateConsoleHostBuilder(context, false, out _).UseWindowsService().Build().Run();
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private static void StartInteractive(StartupContext context, Action<IHostBuilder> trayCallback)
+        {
+            Logger.Debug(trayCallback != null ? "Tray selected" : "Console selected");
+
+            var success = StartInteractive(context, trayCallback, true, out var pluginRefs);
+
+            if (!success)
+            {
+                var unloadSuccess = PluginLoader.UnloadPlugins(pluginRefs);
+
+                if (unloadSuccess)
+                {
+                    StartInteractive(context, trayCallback, false, out _);
+                }
+            }
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private static bool StartService(StartupContext context, bool usePlugins, out List<WeakReference> pluginRefs)
+        {
+            var builder = CreateConsoleHostBuilder(context, usePlugins, out pluginRefs).UseWindowsService();
+
+            return RunBuilder(builder, usePlugins);
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        private static bool StartInteractive(StartupContext context, Action<IHostBuilder> trayCallback, bool usePlugins, out List<WeakReference> pluginRefs)
+        {
+            var builder = CreateConsoleHostBuilder(context, usePlugins, out pluginRefs);
+
+            if (trayCallback != null)
+            {
+                trayCallback(builder);
+            }
+
+            return RunBuilder(builder, usePlugins);
+        }
+
+        private static bool RunBuilder(IHostBuilder builder, bool usePlugins)
+        {
+            try
+            {
+                using var host = builder.Build();
+                host.Run();
+            }
+            catch (Exception e)
+            {
+                if (usePlugins)
+                {
+                    Logger.Warn(e, "Error starting with plugins enabled");
+                }
+
+                return false;
+            }
+
+            return true;
+        }
+
+        private static void StartUtility(StartupContext context, ApplicationModes mode, IConfiguration config)
+        {
+            var assemblies = AssemblyLoader.LoadBaseAssemblies();
+            new HostBuilder()
+                .UseServiceProviderFactory(new DryIocServiceProviderFactory(new Container(rules => rules.WithNzbDroneRules())))
+                .ConfigureContainer<IContainer>(c =>
+                {
+                    c.AutoAddServices(assemblies)
+                        .AddNzbDroneLogger()
+                        .AddDatabase()
+                        .AddStartupContext(context)
+                        .Resolve<UtilityModeRouter>()
+                        .Route(mode);
+                })
+                .ConfigureServices(services =>
+                {
+                    services.Configure<PostgresOptions>(config.GetSection("Lidarr:Postgres"));
+                    services.Configure<AppOptions>(config.GetSection("Lidarr:App"));
+                    services.Configure<AuthOptions>(config.GetSection("Lidarr:Auth"));
+                    services.Configure<ServerOptions>(config.GetSection("Lidarr:Server"));
+                    services.Configure<LogOptions>(config.GetSection("Lidarr:Log"));
+                    services.Configure<UpdateOptions>(config.GetSection("Lidarr:Update"));
+                }).Build();
+        }
+
+        private static IHostBuilder CreateConsoleHostBuilder(StartupContext context, bool usePlugins, out List<WeakReference> pluginRef)
         {
             var config = GetConfiguration(context);
 
@@ -147,12 +206,24 @@ namespace NzbDrone.Host
                 urls.Add(BuildUrl("https", bindAddress, sslPort));
             }
 
+            var assemblies = AssemblyLoader.LoadBaseAssemblies();
+            pluginRef = null;
+
+            if (usePlugins)
+            {
+                var pluginPaths = new AppFolderInfo(context).GetPluginAssemblies().ToList();
+                (var plugins, pluginRef) = PluginLoader.LoadPlugins(pluginPaths);
+
+                assemblies.AddRange(plugins.Where(x => x != null));
+            }
+
             return new HostBuilder()
                 .UseContentRoot(Directory.GetCurrentDirectory())
                 .UseServiceProviderFactory(new DryIocServiceProviderFactory(new Container(rules => rules.WithNzbDroneRules())))
                 .ConfigureContainer<IContainer>(c =>
                 {
-                    c.AutoAddServices(Bootstrap.ASSEMBLIES)
+                    c.AutoAddServices(assemblies)
+                        .SetPluginStatus(usePlugins)
                         .AddNzbDroneLogger()
                         .AddDatabase()
                         .AddStartupContext(context);
@@ -189,7 +260,7 @@ namespace NzbDrone.Host
                 });
         }
 
-        public static ApplicationModes GetApplicationMode(IStartupContext startupContext)
+        private static ApplicationModes GetApplicationMode(IStartupContext startupContext)
         {
             if (startupContext.Help)
             {
diff --git a/src/NzbDrone.Integration.Test/ApiTests/PluginFixture.cs b/src/NzbDrone.Integration.Test/ApiTests/PluginFixture.cs
new file mode 100644
index 000000000..7d8c352c9
--- /dev/null
+++ b/src/NzbDrone.Integration.Test/ApiTests/PluginFixture.cs
@@ -0,0 +1,121 @@
+using System.Threading;
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Common.Serializer;
+using NzbDrone.Core.Messaging.Commands;
+using NzbDrone.Core.Plugins.Commands;
+using NzbDrone.Integration.Test.Client;
+using RestSharp;
+
+namespace NzbDrone.Integration.Test.ApiTests
+{
+    [TestFixture]
+    public class PluginFixture : IntegrationTest
+    {
+        [Test]
+        [Order(0)]
+        public void should_install_plugin()
+        {
+            PostAndWaitForRestart(new InstallPluginCommand
+            {
+                GithubUrl = "https://github.com/ta264/Lidarr.Plugin.Deemix"
+            });
+
+            WaitForRestart();
+
+            var plugins = Plugins.All();
+            plugins.Should().HaveCount(1);
+            plugins[0].Name.Should().Be("Deemix");
+        }
+
+        [Test]
+        [Order(1)]
+        public void should_uninstall_plugin()
+        {
+            var plugins = Plugins.All();
+            plugins.Should().HaveCount(1);
+            plugins[0].Name.Should().Be("Deemix");
+
+            PostAndWaitForRestart(new UninstallPluginCommand
+            {
+                GithubUrl = "https://github.com/ta264/Lidarr.Plugin.Deemix"
+            });
+
+            WaitForRestart();
+
+            plugins = Plugins.All();
+            plugins.Should().BeEmpty();
+        }
+
+        // Installing / uninstalling triggers a restart, so manually shutdown the restarted app
+        [OneTimeTearDown]
+        public void TearDown()
+        {
+            var request = new RestRequest("system/shutdown");
+            request.Method = Method.POST;
+            request.AddHeader("Authorization", ApiKey);
+            RestClient.Execute(request);
+        }
+
+        private SimpleCommandResource PostAndWaitForRestart<T>(T command)
+            where T : Command, new()
+        {
+            var request = new RestRequest("command");
+            request.Method = Method.POST;
+            request.AddHeader("Authorization", ApiKey);
+            request.AddJsonBody(command);
+
+            var result = RestClient.Execute(request);
+            var resource = Json.Deserialize<SimpleCommandResource>(result.Content);
+
+            var id = resource.Id;
+
+            id.Should().NotBe(0);
+
+            for (var i = 0; i < 50; i++)
+            {
+                if (resource?.Status == CommandStatus.Completed)
+                {
+                    return resource;
+                }
+
+                var get = new RestRequest($"command/{id}");
+                get.AddHeader("Authorization", ApiKey);
+
+                result = RestClient.Execute(get);
+
+                TestContext.Progress.WriteLine("Waiting for command to finish : {0}  [{1}] {2}\n{3}", result.ResponseStatus, result.StatusDescription, result.ErrorException?.Message, result.Content);
+
+                resource = Json.Deserialize<SimpleCommandResource>(result.Content);
+                Thread.Sleep(500);
+            }
+
+            Assert.Fail("Command failed");
+            return resource;
+        }
+
+        private void WaitForRestart()
+        {
+            for (var i = 0; i < 60; i++)
+            {
+                var request = new RestRequest("system/status");
+                request.AddHeader("Authorization", ApiKey);
+                request.AddHeader("X-Api-Key", ApiKey);
+
+                var statusCall = RestClient.Get(request);
+
+                if (statusCall.ResponseStatus == ResponseStatus.Completed)
+                {
+                    TestContext.Progress.WriteLine($"Lidarr {Port} is started. Running Tests");
+                    return;
+                }
+
+                TestContext.Progress.WriteLine("Waiting for Lidarr to start. Response Status : {0}  [{1}] {2}", statusCall.ResponseStatus, statusCall.StatusDescription, statusCall.ErrorException.Message);
+
+                Thread.Sleep(500);
+            }
+
+            Assert.Fail("Timed out waiting for restart");
+        }
+    }
+}
diff --git a/src/NzbDrone.Integration.Test/IntegrationTest.cs b/src/NzbDrone.Integration.Test/IntegrationTest.cs
index 811f269b0..39775bf10 100644
--- a/src/NzbDrone.Integration.Test/IntegrationTest.cs
+++ b/src/NzbDrone.Integration.Test/IntegrationTest.cs
@@ -64,7 +64,7 @@ namespace NzbDrone.Integration.Test
             indexer.ConfigContract = nameof(NewznabSettings);
             indexer.Implementation = nameof(Newznab);
             indexer.Name = "NewznabTest";
-            indexer.Protocol = Core.Indexers.DownloadProtocol.Usenet;
+            indexer.Protocol = nameof(Core.Indexers.UsenetDownloadProtocol);
 
             // Change Console Log Level to Debug so we get more details.
             var config = HostConfig.Get(1);
diff --git a/src/NzbDrone.Integration.Test/IntegrationTestBase.cs b/src/NzbDrone.Integration.Test/IntegrationTestBase.cs
index 01f254bf9..97f167ffd 100644
--- a/src/NzbDrone.Integration.Test/IntegrationTestBase.cs
+++ b/src/NzbDrone.Integration.Test/IntegrationTestBase.cs
@@ -13,6 +13,7 @@ using Lidarr.Api.V1.DownloadClient;
 using Lidarr.Api.V1.History;
 using Lidarr.Api.V1.Profiles.Quality;
 using Lidarr.Api.V1.RootFolders;
+using Lidarr.Api.V1.System.Plugins;
 using Lidarr.Api.V1.System.Tasks;
 using Lidarr.Api.V1.Tags;
 using Microsoft.AspNetCore.SignalR.Client;
@@ -49,6 +50,7 @@ namespace NzbDrone.Integration.Test
         public LogsClient Logs;
         public ClientBase<NamingConfigResource> NamingConfig;
         public NotificationClient Notifications;
+        public ClientBase<PluginResource> Plugins;
         public ClientBase<QualityProfileResource> QualityProfiles;
         public ReleaseClient Releases;
         public ReleasePushClient ReleasePush;
@@ -115,6 +117,7 @@ namespace NzbDrone.Integration.Test
             Logs = new LogsClient(RestClient, ApiKey);
             NamingConfig = new ClientBase<NamingConfigResource>(RestClient, ApiKey, "config/naming");
             Notifications = new NotificationClient(RestClient, ApiKey);
+            Plugins = new ClientBase<PluginResource>(RestClient, ApiKey, "system/plugins");
             QualityProfiles = new ClientBase<QualityProfileResource>(RestClient, ApiKey);
             Releases = new ReleaseClient(RestClient, ApiKey);
             ReleasePush = new ReleasePushClient(RestClient, ApiKey);
diff --git a/src/NzbDrone.Update/UpdateApp.cs b/src/NzbDrone.Update/UpdateApp.cs
index 6b6838b86..5f6903977 100644
--- a/src/NzbDrone.Update/UpdateApp.cs
+++ b/src/NzbDrone.Update/UpdateApp.cs
@@ -1,9 +1,9 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using DryIoc;
 using NLog;
+using NzbDrone.Common.Composition;
 using NzbDrone.Common.Composition.Extensions;
 using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Extensions;
@@ -36,8 +36,9 @@ namespace NzbDrone.Update
 
                 Logger.Info("Starting Lidarr Update Client");
 
+                var assemblies = AssemblyLoader.LoadUpdateAssemblies();
                 var container = new Container(rules => rules.WithNzbDroneRules())
-                    .AutoAddServices(new List<string> { "Lidarr.Update" })
+                    .AutoAddServices(assemblies)
                     .AddNzbDroneLogger()
                     .AddStartupContext(startupContext);