diff --git a/Pipfile b/Pipfile
index 8062a68d..adba0693 100644
--- a/Pipfile
+++ b/Pipfile
@@ -4,70 +4,69 @@ url = "https://pypi.org/simple"
 verify_ssl = true
 
 [dev-packages]
-django-debug-toolbar = "==1.11.0"
-django-debug-panel = "*"
 bumpversion = "==0.5.3"
+coverage = "==4.0.3"
+django-debug-panel = "*"
+django-debug-toolbar = "==1.11.0"
 django-nose = "==1.4.6"
+factory_boy = "==2.8.1"
+freezegun = "==0.3.7"
+mock = "==2.0.0"
+moto = "==1.3.8"
 nose = "*"
 nose-progressive = "==1.5.1"
-xmlunittest = "*"
-coverage = "==4.0.3"
+pyquery = "==1.2.13"
 python-coveralls = "*"
-freezegun = "==0.3.7"
-mock = "==2.0.0"
 tox = "*"
-pyquery = "==1.2.13"
-moto = "==1.3.8"
-factory_boy = "==2.8.1"
+xmlunittest = "*"
 
 [packages]
-uwsgi = "*"
-Django = "==2.2.0"
-djangorestframework = "==3.7.7"
-django-suit = "==0.2.26"
-django-extensions = "==2.1.6"
-django-storages = "==1.6.5"
+bitmapist = "==3.97"
+boto = "==2.49.0"
+boto3 = "==1.9.77"
+botocore = "==1.12.133"
+celery = {extras = ["redis"],version = "==4.3.0"}
+clom = "==0.8.0a1"
+django = "==2.2.0"
 django-absolute = "*"
-django-versionfield3 = "==0.1.8"
-django-redis = "*"
+django-ace = "*"
+django-bootstrap3 = "*"
 django-bower = "==5.1.0"
-django-nvd3 = "==0.9.7"
 django-cacheops = "*"
+django-dynamic-preferences = "==1.7.0"
+django-extensions = "==2.1.6"
 django-filter = "==2.1.0"
+django-nvd3 = "==0.9.7"
+django-redis = "*"
+django-select2 = "==6.3.1"
+django-ses = "==0.8.2"
+django-storages = "==1.6.5"
+django-suit = "==0.2.26"
 django-tables2 = "==2.0.6"
-django-ace = "*"
 django-tinymce = "==2.6.1"
-django-dynamic-preferences = "==1.7.0"
-django-bootstrap3 = "*"
-django-ses = "==0.8.2"
-django-select2 = "==6.3.1"
-ipaddress = "*"
+django-versionfield3 = "==0.1.8"
+djangorestframework = "==3.9.1"
+ecdsa = "==0.13.3"
 funcsigs = "*"
-psycopg2-binary = "==2.8.4"
-boto = "==2.49.0"
-boto3 = "==1.9.77"
-botocore = "==1.12.133"
-celery = {extras = ["redis"],version = "==4.3.0"}
-redis = "*"
-raven = "*"
-requests = "*"
-six = "==1.10.0"
+furl = "==0.4.93"
 future = "==0.16.0"
+ipaddress = "*"
 jsonfield = "==1.0.3"
-bitmapist = "==3.97"
-singledispatch = "==3.4.0.3"
+lxml = "==4.3.3"
+markdown = "<3.0.0"
 msgpack-python = "==0.4.7"
-clom = "==0.8.0a1"
-furl = "==0.4.93"
-pytz = "==2016.4"
+paver = "==1.2.4"
 protobuf = "*"
 protobuf3-to-dict = "*"
-ecdsa = "==0.13"
+psycopg2-binary = "==2.8.4"
 python-magic = "==0.4.15"
-Markdown = "<3.0.0"
-paver = "==1.2.4"
-Pillow = "*"
-lxml = "==4.3.3"
+pytz = "==2016.4"
+raven = "*"
+redis = "*"
+requests = "*"
+singledispatch = "==3.4.0.3"
+six = "==1.10.0"
+uwsgi = "*"
 
 [requires]
 python_version = "3.7"
diff --git a/Pipfile.lock b/Pipfile.lock
index 41590fa7..819342ef 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "bee90b2bf6dcc7e1bbe219dfdc5464fad06fed48fa35a84b90f7e6baa84905f1"
+            "sha256": "22b7c00888ba958d865ce006f33bd903eced4538c83743c63631b41c9456a075"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -74,10 +74,10 @@
         },
         "certifi": {
             "hashes": [
-                "sha256:017c25db2a153ce562900032d5bc68e9f191e44e9a0f762f373977de9df1fbb3",
-                "sha256:25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f"
+                "sha256:1d987a998c75633c40847cc966fcf5904906c920a7f17ef374f5aa4282abd304",
+                "sha256:51fcb31174be6e6664c5f69e3e1691a2d72a1a12e90f872cbdb1567eb47b6519"
             ],
-            "version": "==2019.11.28"
+            "version": "==2020.4.5.1"
         },
         "chardet": {
             "hashes": [
@@ -118,10 +118,10 @@
         },
         "django-appconf": {
             "hashes": [
-                "sha256:35f13ca4d567f132b960e2cd4c832c2d03cb6543452d34e29b7ba10371ba80e3",
-                "sha256:c98a7af40062e996b921f5962a1c4f3f0c979fa7885f7be4710cceb90ebe13a6"
+                "sha256:1b1d0e1069c843ebe8ae5aa48ec52403b1440402b320c3e3a206a0907e97bb06",
+                "sha256:be58deb54a43d77d2e1621fe59f787681376d3cd0b8bd8e4758ef6c3a6453380"
             ],
-            "version": "==1.0.3"
+            "version": "==1.0.4"
         },
         "django-bootstrap3": {
             "hashes": [
@@ -242,11 +242,11 @@
         },
         "djangorestframework": {
             "hashes": [
-                "sha256:1f6baf40ed456ed2af6bd1a4ff8bbc3503cebea16509993aea2b7085bc097766",
-                "sha256:9f9e94e8d22b100ed3a43cee8c47a7ff7b185e778a1f2da9ec5c73fc4e081b87"
+                "sha256:79c6efbb2514bc50cf25906d7c0a5cfead714c7af667ff4bd110312cd380ae66",
+                "sha256:a4138613b67e3a223be6c97f53b13d759c5b90d2b433bad670b8ebf95402075f"
             ],
             "index": "pypi",
-            "version": "==3.7.7"
+            "version": "==3.9.1"
         },
         "docutils": {
             "hashes": [
@@ -257,11 +257,11 @@
         },
         "ecdsa": {
             "hashes": [
-                "sha256:40d002cf360d0e035cf2cb985e1308d41aaa087cbfc135b2dc2d844296ea546c",
-                "sha256:64cf1ee26d1cde3c73c6d7d107f835fed7c6a2904aef9eac223d57ad800c43fa"
+                "sha256:163c80b064a763ea733870feb96f9dd9b92216cfcacd374837af18e4e8ec3d4d",
+                "sha256:9814e700890991abeceeb2242586024d4758c8fc18445b194a49bd62d85861db"
             ],
             "index": "pypi",
-            "version": "==0.13"
+            "version": "==0.13.3"
         },
         "funcsigs": {
             "hashes": [
@@ -300,11 +300,11 @@
         },
         "importlib-metadata": {
             "hashes": [
-                "sha256:06f5b3a99029c7134207dd882428a66992a9de2bef7c2b699b5641f9886c3302",
-                "sha256:b97607a1a18a5100839aec1dc26a1ea17ee0d93b20b0f008d80a5a050afb200b"
+                "sha256:2a688cbaa90e0cc587f1df48bdc97a6eadccdcd9c35fb3f976a09e3b5016d90f",
+                "sha256:34513a8a0c4962bc66d35b359558fd8a5e10cd472d37aec5f66858addef32c1e"
             ],
             "markers": "python_version < '3.8'",
-            "version": "==1.5.0"
+            "version": "==1.6.0"
         },
         "ipaddress": {
             "hashes": [
@@ -456,34 +456,6 @@
             ],
             "version": "==0.2.1"
         },
-        "pillow": {
-            "hashes": [
-                "sha256:0a628977ac2e01ca96aaae247ec2bd38e729631ddf2221b4b715446fd45505be",
-                "sha256:4d9ed9a64095e031435af120d3c910148067087541131e82b3e8db302f4c8946",
-                "sha256:54ebae163e8412aff0b9df1e88adab65788f5f5b58e625dc5c7f51eaf14a6837",
-                "sha256:5bfef0b1cdde9f33881c913af14e43db69815c7e8df429ceda4c70a5e529210f",
-                "sha256:5f3546ceb08089cedb9e8ff7e3f6a7042bb5b37c2a95d392fb027c3e53a2da00",
-                "sha256:5f7ae9126d16194f114435ebb79cc536b5682002a4fa57fa7bb2cbcde65f2f4d",
-                "sha256:62a889aeb0a79e50ecf5af272e9e3c164148f4bd9636cc6bcfa182a52c8b0533",
-                "sha256:7406f5a9b2fd966e79e6abdaf700585a4522e98d6559ce37fc52e5c955fade0a",
-                "sha256:8453f914f4e5a3d828281a6628cf517832abfa13ff50679a4848926dac7c0358",
-                "sha256:87269cc6ce1e3dee11f23fa515e4249ae678dbbe2704598a51cee76c52e19cda",
-                "sha256:875358310ed7abd5320f21dd97351d62de4929b0426cdb1eaa904b64ac36b435",
-                "sha256:8ac6ce7ff3892e5deaab7abaec763538ffd011f74dc1801d93d3c5fc541feee2",
-                "sha256:91b710e3353aea6fc758cdb7136d9bbdcb26b53cefe43e2cba953ac3ee1d3313",
-                "sha256:9d2ba4ed13af381233e2d810ff3bab84ef9f18430a9b336ab69eaf3cd24299ff",
-                "sha256:a62ec5e13e227399be73303ff301f2865bf68657d15ea50b038d25fc41097317",
-                "sha256:ab76e5580b0ed647a8d8d2d2daee170e8e9f8aad225ede314f684e297e3643c2",
-                "sha256:bf4003aa538af3f4205c5fac56eacaa67a6dd81e454ffd9e9f055fff9f1bc614",
-                "sha256:bf598d2e37cf8edb1a2f26ed3fb255191f5232badea4003c16301cb94ac5bdd0",
-                "sha256:c18f70dc27cc5d236f10e7834236aff60aadc71346a5bc1f4f83a4b3abee6386",
-                "sha256:c5ed816632204a2fc9486d784d8e0d0ae754347aba99c811458d69fcdfd2a2f9",
-                "sha256:dc058b7833184970d1248135b8b0ab702e6daa833be14035179f2acb78ff5636",
-                "sha256:ff3797f2f16bf9d17d53257612da84dd0758db33935777149b3334c01ff68865"
-            ],
-            "index": "pypi",
-            "version": "==7.0.0"
-        },
         "protobuf": {
             "hashes": [
                 "sha256:0bae429443cc4748be2aadfdaf9633297cfaeb24a9a02d0ab15849175ce90fab",
@@ -692,10 +664,10 @@
         },
         "asgiref": {
             "hashes": [
-                "sha256:7e06d934a7718bf3975acbf87780ba678957b87c7adc056f13b6215d610695a0",
-                "sha256:ea448f92fc35a0ef4b1508f53a04c4670255a3f33d22a81c8fc9c872036adbe5"
+                "sha256:8036f90603c54e93521e5777b2b9a39ba1bad05773fcf2d208f0299d1df58ce5",
+                "sha256:9ca8b952a0a9afa61d30aa6d3d9b570bb3fd6bafcf7ec9e6bed43b936133db1c"
             ],
-            "version": "==3.2.3"
+            "version": "==3.2.7"
         },
         "attrs": {
             "hashes": [
@@ -706,9 +678,9 @@
         },
         "aws-sam-translator": {
             "hashes": [
-                "sha256:320a341d659580ad04e79c46fc93f50996363745a0c2728f9cd025ad78c43e36"
+                "sha256:3ba6a821eda29ca8ea1306e27a8135256d6136f1b0b29c6cbf9a107dfd1c2dd9"
             ],
-            "version": "==1.21.0"
+            "version": "==1.22.0"
         },
         "aws-xray-sdk": {
             "hashes": [
@@ -759,10 +731,10 @@
         },
         "certifi": {
             "hashes": [
-                "sha256:017c25db2a153ce562900032d5bc68e9f191e44e9a0f762f373977de9df1fbb3",
-                "sha256:25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f"
+                "sha256:1d987a998c75633c40847cc966fcf5904906c920a7f17ef374f5aa4282abd304",
+                "sha256:51fcb31174be6e6664c5f69e3e1691a2d72a1a12e90f872cbdb1567eb47b6519"
             ],
-            "version": "==2019.11.28"
+            "version": "==2020.4.5.1"
         },
         "cffi": {
             "hashes": [
@@ -799,10 +771,10 @@
         },
         "cfn-lint": {
             "hashes": [
-                "sha256:d6664c0acff6ebaf26d4df79f7fc7453b8c7c58edc761f55a0eac31641400c67",
-                "sha256:e57de8fab2e83640868c24ad40f71930d187a0bb5525efce7e3cab6c3c3e383d"
+                "sha256:3ff2a77214777360516945d06cbbbeecddc9c7969832b6e1b699f94144b89317",
+                "sha256:58652622b28732223a9a4c2b5625c5f4f4d9509bbf8d06b1b891a1ef9782f1fd"
             ],
-            "version": "==0.28.4"
+            "version": "==0.29.4"
         },
         "chardet": {
             "hashes": [
@@ -836,29 +808,27 @@
         },
         "cryptography": {
             "hashes": [
-                "sha256:02079a6addc7b5140ba0825f542c0869ff4df9a69c360e339ecead5baefa843c",
-                "sha256:1df22371fbf2004c6f64e927668734070a8953362cd8370ddd336774d6743595",
-                "sha256:369d2346db5934345787451504853ad9d342d7f721ae82d098083e1f49a582ad",
-                "sha256:3cda1f0ed8747339bbdf71b9f38ca74c7b592f24f65cdb3ab3765e4b02871651",
-                "sha256:44ff04138935882fef7c686878e1c8fd80a723161ad6a98da31e14b7553170c2",
-                "sha256:4b1030728872c59687badcca1e225a9103440e467c17d6d1730ab3d2d64bfeff",
-                "sha256:58363dbd966afb4f89b3b11dfb8ff200058fbc3b947507675c19ceb46104b48d",
-                "sha256:6ec280fb24d27e3d97aa731e16207d58bd8ae94ef6eab97249a2afe4ba643d42",
-                "sha256:7270a6c29199adc1297776937a05b59720e8a782531f1f122f2eb8467f9aab4d",
-                "sha256:73fd30c57fa2d0a1d7a49c561c40c2f79c7d6c374cc7750e9ac7c99176f6428e",
-                "sha256:7f09806ed4fbea8f51585231ba742b58cbcfbfe823ea197d8c89a5e433c7e912",
-                "sha256:90df0cc93e1f8d2fba8365fb59a858f51a11a394d64dbf3ef844f783844cc793",
-                "sha256:971221ed40f058f5662a604bd1ae6e4521d84e6cad0b7b170564cc34169c8f13",
-                "sha256:a518c153a2b5ed6b8cc03f7ae79d5ffad7315ad4569b2d5333a13c38d64bd8d7",
-                "sha256:b0de590a8b0979649ebeef8bb9f54394d3a41f66c5584fff4220901739b6b2f0",
-                "sha256:b43f53f29816ba1db8525f006fa6f49292e9b029554b3eb56a189a70f2a40879",
-                "sha256:d31402aad60ed889c7e57934a03477b572a03af7794fa8fb1780f21ea8f6551f",
-                "sha256:de96157ec73458a7f14e3d26f17f8128c959084931e8997b9e655a39c8fde9f9",
-                "sha256:df6b4dca2e11865e6cfbfb708e800efb18370f5a46fd601d3755bc7f85b3a8a2",
-                "sha256:ecadccc7ba52193963c0475ac9f6fa28ac01e01349a2ca48509667ef41ffd2cf",
-                "sha256:fb81c17e0ebe3358486cd8cc3ad78adbae58af12fc2bf2bc0bb84e8090fa5ce8"
-            ],
-            "version": "==2.8"
+                "sha256:0cacd3ef5c604b8e5f59bf2582c076c98a37fe206b31430d0cd08138aff0986e",
+                "sha256:192ca04a36852a994ef21df13cca4d822adbbdc9d5009c0f96f1d2929e375d4f",
+                "sha256:19ae795137682a9778892fb4390c07811828b173741bce91e30f899424b3934d",
+                "sha256:1b9b535d6b55936a79dbe4990b64bb16048f48747c76c29713fea8c50eca2acf",
+                "sha256:2a2ad24d43398d89f92209289f15265107928f22a8d10385f70def7a698d6a02",
+                "sha256:3be7a5722d5bfe69894d3f7bbed15547b17619f3a88a318aab2e37f457524164",
+                "sha256:49870684da168b90110bbaf86140d4681032c5e6a2461adc7afdd93be5634216",
+                "sha256:587f98ce27ac4547177a0c6fe0986b8736058daffe9160dcf5f1bd411b7fbaa1",
+                "sha256:5aca6f00b2f42546b9bdf11a69f248d1881212ce5b9e2618b04935b87f6f82a1",
+                "sha256:6b744039b55988519cc183149cceb573189b3e46e16ccf6f8c46798bb767c9dc",
+                "sha256:6b91cab3841b4c7cb70e4db1697c69f036c8bc0a253edc0baa6783154f1301e4",
+                "sha256:7598974f6879a338c785c513e7c5a4329fbc58b9f6b9a6305035fca5b1076552",
+                "sha256:7a279f33a081d436e90e91d1a7c338553c04e464de1c9302311a5e7e4b746088",
+                "sha256:95e1296e0157361fe2f5f0ed307fd31f94b0ca13372e3673fa95095a627636a1",
+                "sha256:9fc9da390e98cb6975eadf251b6e5fa088820141061bf041cd5c72deba1dc526",
+                "sha256:cc20316e3f5a6b582fc3b029d8dc03aabeb645acfcb7fc1d9848841a33265748",
+                "sha256:d1bf5a1a0d60c7f9a78e448adcb99aa101f3f9588b16708044638881be15d6bc",
+                "sha256:ed1d0760c7e46436ec90834d6f10477ff09475c692ed1695329d324b2c5cd547",
+                "sha256:ef9a55013676907df6c9d7dd943eb1770d014f68beaa7e73250fb43c759f4585"
+            ],
+            "version": "==2.9"
         },
         "cssselect": {
             "hashes": [
@@ -867,6 +837,13 @@
             ],
             "version": "==1.1.0"
         },
+        "decorator": {
+            "hashes": [
+                "sha256:41fa54c2a0cc4ba648be4fd43cff00aedf5b9465c9bf18d64325bc225f08f760",
+                "sha256:e3a62f0520172440ca0dcc823749319382e377f37f140a0b99ef45fecb84bfe7"
+            ],
+            "version": "==4.4.2"
+        },
         "distlib": {
             "hashes": [
                 "sha256:2e166e231a26b36d6dfe35a48c4464346620f8645ed0ace01ee31822b288de21"
@@ -920,11 +897,11 @@
         },
         "ecdsa": {
             "hashes": [
-                "sha256:40d002cf360d0e035cf2cb985e1308d41aaa087cbfc135b2dc2d844296ea546c",
-                "sha256:64cf1ee26d1cde3c73c6d7d107f835fed7c6a2904aef9eac223d57ad800c43fa"
+                "sha256:163c80b064a763ea733870feb96f9dd9b92216cfcacd374837af18e4e8ec3d4d",
+                "sha256:9814e700890991abeceeb2242586024d4758c8fc18445b194a49bd62d85861db"
             ],
             "index": "pypi",
-            "version": "==0.13"
+            "version": "==0.13.3"
         },
         "factory-boy": {
             "hashes": [
@@ -936,10 +913,10 @@
         },
         "faker": {
             "hashes": [
-                "sha256:440d68fe0e46c1658b1975b2497abe0c24a7f772e3892253f31e713ffcc48965",
-                "sha256:ee24608768549c2c69e593e9d7a3b53c9498ae735534243ec8390cae5d529f8b"
+                "sha256:2d3f866ef25e1a5af80e7b0ceeacc3c92dec5d0fdbad3e2cb6adf6e60b22188f",
+                "sha256:b89aa33837498498e15c709eb40c31386408a901a53c7a5e12a425737a767976"
             ],
-            "version": "==4.0.1"
+            "version": "==4.0.2"
         },
         "filelock": {
             "hashes": [
@@ -971,11 +948,11 @@
         },
         "importlib-metadata": {
             "hashes": [
-                "sha256:06f5b3a99029c7134207dd882428a66992a9de2bef7c2b699b5641f9886c3302",
-                "sha256:b97607a1a18a5100839aec1dc26a1ea17ee0d93b20b0f008d80a5a050afb200b"
+                "sha256:2a688cbaa90e0cc587f1df48bdc97a6eadccdcd9c35fb3f976a09e3b5016d90f",
+                "sha256:34513a8a0c4962bc66d35b359558fd8a5e10cd472d37aec5f66858addef32c1e"
             ],
             "markers": "python_version < '3.8'",
-            "version": "==1.5.0"
+            "version": "==1.6.0"
         },
         "jinja2": {
             "hashes": [
@@ -1112,6 +1089,14 @@
             "index": "pypi",
             "version": "==1.3.8"
         },
+        "networkx": {
+            "hashes": [
+                "sha256:cdfbf698749a5014bf2ed9db4a07a5295df1d3a53bf80bf3cbd61edf9df05fa1",
+                "sha256:f8f4ff0b6f96e4f9b16af6b84622597b5334bf9cae8cf9b2e42e7985d5c95c64"
+            ],
+            "markers": "python_version >= '3.5'",
+            "version": "==2.4"
+        },
         "nose": {
             "hashes": [
                 "sha256:9ff7c6cc443f8c51994b34a667bbcf45afd6d945be7477b52e97516fd17c53ac",
@@ -1138,10 +1123,10 @@
         },
         "pbr": {
             "hashes": [
-                "sha256:139d2625547dbfa5fb0b81daebb39601c478c21956dc57e2e07b74450a8c506b",
-                "sha256:61aa52a0f18b71c5cc58232d2cf8f8d09cd67fcad60b742a60124cb8d6951488"
+                "sha256:07f558fece33b05caf857474a366dfcc00562bca13dd8b47b2b3e22d9f9bf55c",
+                "sha256:579170e23f8e0c2f24b0de612f71f648eccb79fb1322c814ae6b3c07b5ba23e8"
             ],
-            "version": "==5.4.4"
+            "version": "==5.4.5"
         },
         "pluggy": {
             "hashes": [
@@ -1173,10 +1158,10 @@
         },
         "pyparsing": {
             "hashes": [
-                "sha256:4c830582a84fb022400b85429791bc551f1f4871c33f23e44f353119e92f969f",
-                "sha256:c342dccb5250c08d45fd6f8b4a559613ca603b57498511740e65cd11a2e7dcec"
+                "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1",
+                "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b"
             ],
-            "version": "==2.4.6"
+            "version": "==2.4.7"
         },
         "pyquery": {
             "hashes": [
@@ -1188,9 +1173,9 @@
         },
         "pyrsistent": {
             "hashes": [
-                "sha256:cdc7b5e3ed77bed61270a47d35434a30617b9becdf2478af76ad2c6ade307280"
+                "sha256:28669905fe725965daa16184933676547c5bb40a5153055a8dee2a4bd7933ad3"
             ],
-            "version": "==0.15.7"
+            "version": "==0.16.0"
         },
         "python-coveralls": {
             "hashes": [
@@ -1227,20 +1212,20 @@
         },
         "pyyaml": {
             "hashes": [
-                "sha256:059b2ee3194d718896c0ad077dd8c043e5e909d9180f387ce42012662a4946d6",
-                "sha256:1cf708e2ac57f3aabc87405f04b86354f66799c8e62c28c5fc5f88b5521b2dbf",
-                "sha256:24521fa2890642614558b492b473bee0ac1f8057a7263156b02e8b14c88ce6f5",
-                "sha256:4fee71aa5bc6ed9d5f116327c04273e25ae31a3020386916905767ec4fc5317e",
-                "sha256:70024e02197337533eef7b85b068212420f950319cc8c580261963aefc75f811",
-                "sha256:74782fbd4d4f87ff04159e986886931456a1894c61229be9eaf4de6f6e44b99e",
-                "sha256:940532b111b1952befd7db542c370887a8611660d2b9becff75d39355303d82d",
-                "sha256:cb1f2f5e426dc9f07a7681419fe39cee823bb74f723f36f70399123f439e9b20",
-                "sha256:dbbb2379c19ed6042e8f11f2a2c66d39cceb8aeace421bfc29d085d93eda3689",
-                "sha256:e3a057b7a64f1222b56e47bcff5e4b94c4f61faac04c7c4ecb1985e18caa3994",
-                "sha256:e9f45bd5b92c7974e59bcd2dcc8631a6b6cc380a904725fce7bc08872e691615"
+                "sha256:06a0d7ba600ce0b2d2fe2e78453a470b5a6e000a985dd4a4e54e436cc36b0e97",
+                "sha256:240097ff019d7c70a4922b6869d8a86407758333f02203e0fc6ff79c5dcede76",
+                "sha256:4f4b913ca1a7319b33cfb1369e91e50354d6f07a135f3b901aca02aa95940bd2",
+                "sha256:69f00dca373f240f842b2931fb2c7e14ddbacd1397d57157a9b005a6a9942648",
+                "sha256:73f099454b799e05e5ab51423c7bcf361c58d3206fa7b0d555426b1f4d9a3eaf",
+                "sha256:74809a57b329d6cc0fdccee6318f44b9b8649961fa73144a98735b0aaf029f1f",
+                "sha256:7739fc0fa8205b3ee8808aea45e968bc90082c10aef6ea95e855e10abf4a37b2",
+                "sha256:95f71d2af0ff4227885f7a6605c37fd53d3a106fcab511b8860ecca9fcf400ee",
+                "sha256:b8eac752c5e14d3eca0e6dd9199cd627518cb5ec06add0de9d32baeee6fe645d",
+                "sha256:cc8955cfbfc7a115fa81d85284ee61147059a753344bc51098f3ccd69b0d7e0c",
+                "sha256:d13155f591e6fcc1ec3b30685d50bf0711574e2c0dfffd7644babf8b5102ca1a"
             ],
             "markers": "python_version != '3.4'",
-            "version": "==5.3"
+            "version": "==5.3.1"
         },
         "requests": {
             "hashes": [
@@ -1302,11 +1287,11 @@
         },
         "tox": {
             "hashes": [
-                "sha256:0cbe98369081fa16bd6f1163d3d0b2a62afa29d402ccfad2bd09fb2668be0956",
-                "sha256:676f1e3e7de245ad870f956436b84ea226210587d1f72c8dfb8cd5ac7b6f0e70"
+                "sha256:a4a6689045d93c208d77230853b28058b7513f5123647b67bf012f82fa168303",
+                "sha256:b2c4b91c975ea5c11463d9ca00bebf82654439c5df0f614807b9bdec62cc9471"
             ],
             "index": "pypi",
-            "version": "==3.14.5"
+            "version": "==3.14.6"
         },
         "urllib3": {
             "hashes": [
@@ -1318,10 +1303,10 @@
         },
         "virtualenv": {
             "hashes": [
-                "sha256:5eba85dfa176fde0425b9b3042ed83f05a1b6309a616b8a3e2a9a94f4bfa27b7",
-                "sha256:99f131be2f90ff2a8fd711261a27845b6c50fc008bef815e710c7fa844eb1467"
+                "sha256:6ea131d41c477f6c4b7863948a9a54f7fa196854dbef73efbdff32b509f4d8bf",
+                "sha256:94f647e12d1e6ced2541b93215e51752aecbd1bbb18eb1816e2867f7532b1fe1"
             ],
-            "version": "==20.0.9"
+            "version": "==20.0.16"
         },
         "websocket-client": {
             "hashes": [
@@ -1332,16 +1317,16 @@
         },
         "werkzeug": {
             "hashes": [
-                "sha256:169ba8a33788476292d04186ab33b01d6add475033dfc07215e6d219cc077096",
-                "sha256:6dc65cf9091cf750012f56f2cad759fa9e879f511b5ff8685e456b4e3bf90d16"
+                "sha256:2de2a5db0baeae7b2d2664949077c2ac63fbd16d98da0ff71837f7d1dea3fd43",
+                "sha256:6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c"
             ],
-            "version": "==1.0.0"
+            "version": "==1.0.1"
         },
         "wrapt": {
             "hashes": [
-                "sha256:0ec40d9fd4ec9f9e3ff9bdd12dbd3535f4085949f4db93025089d7a673ea94e8"
+                "sha256:b62ffa81fb85f4332a4f609cab4ac40709470da05643a082ec1eb88e6d9b97d7"
             ],
-            "version": "==1.12.0"
+            "version": "==1.12.1"
         },
         "xmltodict": {
             "hashes": [
diff --git a/omaha_server/downloads/api.py b/omaha_server/downloads/api.py
index ffaa15de..4f9325a1 100644
--- a/omaha_server/downloads/api.py
+++ b/omaha_server/downloads/api.py
@@ -23,7 +23,6 @@
 from rest_framework import viewsets
 from rest_framework import mixins
 from rest_framework import pagination
-from rest_framework.views import APIView
 from rest_framework.response import Response
 
 from omaha.api import BaseView
@@ -32,7 +31,7 @@
 from sparkle.models import SparkleVersion
 
 
-class LatestVersionView(APIView):
+class LatestVersionView(viewsets.ViewSet):
     """
     API returns an information about the latest versions of applications available on the server. The information contains supported platforms, provided channels, version numbers and download links.
     """
diff --git a/omaha_server/omaha/api.py b/omaha_server/omaha/api.py
index fb0def7f..6c49a720 100644
--- a/omaha_server/omaha/api.py
+++ b/omaha_server/omaha/api.py
@@ -27,7 +27,6 @@
 from rest_framework import viewsets
 from rest_framework import mixins
 from rest_framework import pagination
-from rest_framework.views import APIView
 from rest_framework.response import Response
 
 import pytz
@@ -184,7 +183,7 @@ class ActionViewSet(viewsets.ModelViewSet):
     serializer_class = ActionSerializer
 
 
-class StatisticsMonthsDetailView(APIView):
+class StatisticsMonthsDetailView(viewsets.ViewSet):
     MAC_KEYS = ['new', 'updates']
     OMAHA_KEYS = MAC_KEYS + ['uninstalls']
 
@@ -222,7 +221,7 @@ def get(self, request, app_name, format=None):
         serializer = StatisticsMonthsSerializer(dict(data=data))
         return Response(serializer.data)
 
-class StatisticsVersionsView(APIView):
+class StatisticsVersionsView(viewsets.ViewSet):
     def get_object(self, name):
         try:
             return Application.objects.get(name=name)
@@ -242,7 +241,7 @@ def get(self, request, app_name, format=None):
         return Response(serializer.data)
 
 
-class StatisticsVersionsLiveView(APIView):
+class StatisticsVersionsLiveView(viewsets.ViewSet):
     def get_object(self, name):
         try:
             return Application.objects.get(name=name)
@@ -268,7 +267,7 @@ def get(self, request, app_name, format=None):
         return Response(serializer.data)
 
 
-class StatisticsChannelsView(APIView):
+class StatisticsChannelsView(viewsets.ViewSet):
     def get_object(self, name):
         try:
             return Application.objects.get(name=name)
@@ -288,7 +287,7 @@ def get(self, request, app_name, format=None):
         return Response(serializer.data)
 
 
-class ServerVersionView(APIView):
+class ServerVersionView(viewsets.ViewSet):
     def get(self, request, format=None):
         version = settings.APP_VERSION
         serializer = ServerVersionSerializer(dict(version=version))
diff --git a/requirements.txt b/requirements.txt
index 6bb5523f..9a72d34b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,23 +1,35 @@
-
 amqp==2.4.2
+asn1crypto==0.24.0
+aws-sam-translator==1.11.0
+aws-xray-sdk==2.4.2
 billiard==3.6.0.0
 bitmapist==3.97
-boto3==1.9.77
+blessings==1.7
 boto==2.49.0
+boto3==1.9.77
 botocore==1.12.133
+bumpversion==0.5.3
 celery[redis]==4.3.0
 certifi==2019.3.9
+cffi==1.12.3
+cfn-lint==0.19.1
 chardet==3.0.4
 clom==0.8.0a1
+coverage==4.0.3
+cryptography==2.6.1
+cssselect==1.0.3
 django-absolute==0.3
 django-ace==1.0.5
 django-appconf==1.0.3
 django-bootstrap3==11.0.0
 django-bower==5.1.0
 django-cacheops==4.1
+django-debug-panel==0.8.3
+django-debug-toolbar==1.11
 django-dynamic-preferences==1.7.0
 django-extensions==2.1.6
 django-filter==2.1.0
+django-nose==1.4.6
 django-nvd3==0.9.7
 django-redis==4.10.0
 django-select2==6.3.1
@@ -27,89 +39,46 @@ django-suit==0.2.26
 django-tables2==2.0.6
 django-tinymce==2.6.1
 django-versionfield3==0.1.8
-django==2.2
-djangorestframework==3.7.7
-docutils==0.14
-ecdsa==0.13
-funcsigs==1.0.2
-funcy==1.12
-furl==0.4.93
-future==0.16.0
-idna==2.8
-ipaddress==1.0.22
-jinja2==2.10.1
-jmespath==0.9.4
-jsonfield==1.0.3
-kombu==4.5.0
-markdown==2.6.11
-markupsafe==1.1.1
-msgpack-python==0.4.7
-orderedmultidict==1.0
-paver==1.2.4
-persisting-theory==0.2.1
-pillow==6.0.0
-protobuf3-to-dict==0.1.5
-protobuf==3.7.1
-psycopg2-binary==2.8.4
-python-dateutil==2.8.0 ; python_version >= '2.7'
-python-magic==0.4.15
-python-nvd3==0.14.2
-python-slugify==1.1.4
-pytz==2016.4
-raven==6.10.0
-redis==3.2.1
-requests==2.21.0
-s3transfer==0.1.13
-singledispatch==3.4.0.3
-six==1.10.0
-sqlparse==0.3.0
-unidecode==1.0.23
-urllib3==1.24.2 ; python_version >= '3.4'
-uwsgi==2.0.18
-vine==1.3.0
-asn1crypto==0.24.0
-aws-sam-translator==1.11.0
-aws-xray-sdk==2.4.2
-blessings==1.7
-boto3==1.9.77
-boto==2.49.0
-botocore==1.12.133
-bumpversion==0.5.3
-certifi==2019.3.9
-cffi==1.12.3
-cfn-lint==0.19.1
-chardet==3.0.4
-coverage==4.0.3
-cryptography==2.6.1
-cssselect==1.0.3
-django-debug-panel==0.8.3
-django-debug-toolbar==1.11
-django-nose==1.4.6
-django==2.2
+django==2.2.10
+djangorestframework==3.9.1
 docker-pycreds==0.4.0
 docker==3.7.2
 docutils==0.14
-ecdsa==0.13
+ecdsa==0.13.3
 factory-boy==2.8.1
 faker==1.0.5
 freezegun==0.3.7
+funcsigs==1.0.2
+funcy==1.12
+furl==0.4.93
 future==0.16.0
 idna==2.8
+ipaddress==1.0.22
 jinja2==2.10.1
 jmespath==0.9.4
 jsondiff==1.1.2
+jsonfield==1.0.3
 jsonpatch==1.23
 jsonpickle==1.1
 jsonpointer==2.0
 jsonschema==2.6.0
+kombu==4.5.0
 lxml==4.3.3
+markdown==2.6.11
 markupsafe==1.1.1
 mock==2.0.0
 moto==1.3.8
+msgpack-python==0.4.7
 nose-progressive==1.5.1
 nose==1.3.7
+orderedmultidict==1.0
+paver==1.2.4
 pbr==5.1.3
+persisting-theory==0.2.1
 pluggy==0.9.0
+protobuf==3.7.1
+protobuf3-to-dict==0.1.5
+psycopg2-binary==2.8.4
 py==1.8.0
 pyasn1==0.4.5
 pycparser==2.19
@@ -117,20 +86,28 @@ pyquery==1.2.13
 python-coveralls==2.9.1
 python-dateutil==2.8.0 ; python_version >= '2.7'
 python-jose==3.0.1
+python-magic==0.4.15
+python-nvd3==0.14.2
+python-slugify==1.1.4
 pytz==2016.4
 pyyaml==5.1
+raven==6.10.0
+redis==3.2.1
 requests==2.21.0
 responses==0.10.6
 rsa==4.0
 s3transfer==0.1.13
+singledispatch==3.4.0.3
 six==1.10.0
 sqlparse==0.3.0
 text-unidecode==1.2
 tox==2.5.0
+unidecode==1.0.23
 urllib3==1.24.2 ; python_version >= '3.4'
+uwsgi==2.0.18
+vine==1.3.0
 virtualenv==16.5.0
 websocket-client==0.56.0
-werkzeug==0.15.2
 wrapt==1.11.1
 xmltodict==0.12.0
 xmlunittest==0.5.0