diff --git a/adapters/adgeneration/adgeneration.go b/adapters/adgeneration/adgeneration.go
index 110ec5ce98a..55fafde1d85 100644
--- a/adapters/adgeneration/adgeneration.go
+++ b/adapters/adgeneration/adgeneration.go
@@ -55,8 +55,13 @@ func (adg *AdgenerationAdapter) MakeRequests(request *openrtb2.BidRequest, reqIn
 	headers := http.Header{}
 	headers.Add("Content-Type", "application/json;charset=utf-8")
 	headers.Add("Accept", "application/json")
-	if request.Device != nil && len(request.Device.UA) > 0 {
-		headers.Add("User-Agent", request.Device.UA)
+	if request.Device != nil {
+		if len(request.Device.UA) > 0 {
+			headers.Add("User-Agent", request.Device.UA)
+		}
+		if len(request.Device.IP) > 0 {
+			headers.Add("X-Forwarded-For", request.Device.IP)
+		}
 	}
 
 	bidRequestArray := make([]*adapters.RequestData, 0, numRequests)
@@ -102,7 +107,6 @@ func (adg *AdgenerationAdapter) getRawQuery(id string, request *openrtb2.BidRequ
 	v := url.Values{}
 	v.Set("posall", "SSPLOC")
 	v.Set("id", id)
-	v.Set("sdktype", "0")
 	v.Set("hb", "true")
 	v.Set("t", "json3")
 	v.Set("currency", adg.getCurrency(request))
@@ -112,12 +116,32 @@ func (adg *AdgenerationAdapter) getRawQuery(id string, request *openrtb2.BidRequ
 	if adSize != "" {
 		v.Set("sizes", adSize)
 	}
+	if request.Device != nil && request.Device.OS == "android" {
+		v.Set("sdktype", "1")
+	} else if request.Device != nil && request.Device.OS == "ios" {
+		v.Set("sdktype", "2")
+	} else {
+		v.Set("sdktype", "0")
+	}
 	if request.Site != nil && request.Site.Page != "" {
 		v.Set("tp", request.Site.Page)
 	}
 	if request.Source != nil && request.Source.TID != "" {
 		v.Set("transactionid", request.Source.TID)
 	}
+	if request.App != nil && request.App.Bundle != "" {
+		v.Set("appbundle", request.App.Bundle)
+	}
+	if request.App != nil && request.App.Name != "" {
+		v.Set("appname", request.App.Name)
+	}
+	if request.Device != nil && request.Device.OS == "ios" && request.Device.IFA != "" {
+		v.Set("idfa", request.Device.IFA)
+	}
+	if request.Device != nil && request.Device.OS == "android" && request.Device.IFA != "" {
+		v.Set("advertising_id", request.Device.IFA)
+	}
+
 	return &v
 }
 
@@ -263,7 +287,7 @@ func removeWrapper(ad string) string {
 func Builder(bidderName openrtb_ext.BidderName, config config.Adapter) (adapters.Bidder, error) {
 	bidder := &AdgenerationAdapter{
 		config.Endpoint,
-		"1.0.2",
+		"1.0.3",
 		"JPY",
 	}
 	return bidder, nil
diff --git a/adapters/adgeneration/adgeneration_test.go b/adapters/adgeneration/adgeneration_test.go
index d5d93ac4e0b..c186f19f4c5 100644
--- a/adapters/adgeneration/adgeneration_test.go
+++ b/adapters/adgeneration/adgeneration_test.go
@@ -23,7 +23,7 @@ func TestJsonSamples(t *testing.T) {
 	adapterstest.RunJSONBidderTest(t, "adgenerationtest", bidder)
 }
 
-func TestgetRequestUri(t *testing.T) {
+func TestGetRequestUri(t *testing.T) {
 	bidder, buildErr := Builder(openrtb_ext.BidderAdgeneration, config.Adapter{
 		Endpoint: "https://d.socdm.com/adsv/v1"})
 
diff --git a/adapters/adgeneration/adgenerationtest/exemplary/single-banner-android.json b/adapters/adgeneration/adgenerationtest/exemplary/single-banner-android.json
new file mode 100644
index 00000000000..487d44692e0
--- /dev/null
+++ b/adapters/adgeneration/adgenerationtest/exemplary/single-banner-android.json
@@ -0,0 +1,166 @@
+{
+    "mockBidRequest":{
+        "id": "some-request-id",
+        "site": {
+            "page": "http://example.com/test.html"
+        },
+        "device": {
+            "ua": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.83 Safari/537.36",
+            "ip": "0.0.0.0",
+            "os": "android",
+            "ifa": "advertising_id"
+        },
+        "app": {
+            "name": "adgneration"
+        },
+        "imp": [
+            {
+                "id": "some-impression-id",
+                "banner": {
+                    "format": [
+                        {
+                            "w": 300,
+                            "h": 250
+                        }
+                    ]
+                },
+                "ext": {
+                    "bidder": {
+                        "id": "58278"
+                    }
+                }
+            }
+        ],
+        "tmax": 500
+    },
+    "httpCalls": [
+        {
+            "internalRequest": {
+                "id": "some-request-id",
+                "site": {
+                    "page": "http://example.com/test.html"
+                },
+                "imp": [
+                    {
+                        "id": "some-impression-id",
+                        "banner": {
+                            "format": [
+                                {
+                                    "w": 300,
+                                    "h": 250
+                                }
+                            ]
+                        },
+                        "ext": {
+                            "bidder": {
+                                "id": "58278"
+                            }
+                        }
+                    }
+                ],
+                "tmax": 500
+            },
+            "expectedRequest":{
+                "uri": "https://d.socdm.com/adsv/v1?adapterver=1.0.3&advertising_id=advertising_id&appname=adgneration&currency=JPY&hb=true&id=58278&posall=SSPLOC&sdkname=prebidserver&sdktype=1&sizes=300x250&t=json3&tp=http%3A%2F%2Fexample.com%2Ftest.html",
+                "headers": {
+                    "Accept": [
+                        "application/json"
+                    ],
+                    "Content-Type": [
+                        "application/json;charset=utf-8"
+                    ],
+                    "User-Agent": [
+                        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.83 Safari/537.36"
+                    ],
+                    "X-Forwarded-For": [
+                        "0.0.0.0"
+                    ]
+                }
+            },
+            "mockResponse":{
+                "status": 200,
+                "body": {
+                    "ad": "<!DOCTYPE html>\n  <head>\n    <meta charset=\"UTF-8\">\n    <script src=\"https:\/\/i.socdm.com\/sdk\/js\/adg-script-base.js\" type=\"text\/javascript\"><\/script>\n    <script type=\"text\/javascript\">\n      adsettings = {\n        locationid  : 58278,\n        rotation    : 0,\n        displaytype : 1,\n        sdktype     : \"0\",\n        scheduleid  : 512601\n      };\n    <\/script>\n    <style>\n      body {\n        margin:0;\n        padding:0;\n      }\n    <\/style>\n  <\/head>\n  <body>\n    <div id=\"medibasspContainer\">\n      <iframe src=\"https:\/\/s3-ap-northeast-1.amazonaws.com\/sdk-temp\/adg-sample-ad\/300x250.html?prc=-Cuepak&rd=https%3A%2F%2Ftg.socdm.com%2Frd%2Fv1%2Fz%2FhKFj2gDXY2hzbT0xOTgsZmJkZGMyNWEvNTgyNzgvU1NQTE9DLzUxMjYwMS83MjExNS43Njg1NS41MTI2MDEvMTA5MzkyNi82NDkxOS81ODI3ODpTU1BMT0M6Ki9jdD0xNTg1MjEyMDg1Nzg5O3NyPWh0dHBzO2RzcGlkPTMwMTtwcj16RGFfYVY0O3ByYj15UTtwcm89eVE7cHJvYz1KUFk7Y3JkMnk9MTA5LjQzMDAwMDAwMDAwMDAxO2NyeTJkPTAuMDA5MTM4MjYxOTAyNTg2MTI3MztpZHg9MDulc2VxaWTaACQ0NzFhM2JlNS1lYTQzLWRhZjAtYjhjZi1mNjJkNTA1N2Y5ZWOnc2VxdGltZa0xNTg1MjEyMDg1Nzg5pHh1aWS4WE52SVNNQ281bUlBQU1hN2dOUUFBQUFB%2Fp%2Fctsv%3Dm-ad226%3Bseqid%3D471a3be5-ea43-daf0-b8cf-f62d5057f9ec%3B%2Fg%2FU%3A%3Furl%3D\" style=\"border: 0px;\" width=\"300\" height=\"250\" frameborder=\"0\" scrolling=\"no\"><\/iframe>\n    <\/div>\n  <\/body>\n",
+                    "beacon": "<img src=\"https://tg.socdm.com/bc/v3?b=beaconID&amp;xuid=XUID&amp;ctsv=CTSV&amp;seqid=SeqID&amp;seqtime=SeqTime&amp;seqctx=SeqCtx&amp;t=.gif\" width=\"1\" height=\"1\" style=\"display:none;border:none;padding:0;margin:0;width:1px;height:1px\"/>",
+                    "beaconurl": "https://tg.socdm.com/bc/v3?b=beaconID&t=.gif",
+                    "cpm": 46.6,
+                    "creativeid": "Dummy_supership.jp",
+                    "displaytype": "1",
+                    "h": 250,
+                    "ids": {
+                        "anid": "",
+                        "diid": "",
+                        "idfa": "",
+                        "soc": "Soc"
+                    },
+                    "location_params": null,
+                    "locationid": "58278",
+                    "results": [
+                        {
+                            "ad": "<!DOCTYPE html>\n  <head>\n    <meta charset=\"UTF-8\">\n    <script src=\"https:\/\/i.socdm.com\/sdk\/js\/adg-script-base.js\" type=\"text\/javascript\"><\/script>\n    <script type=\"text\/javascript\">\n      adsettings = {\n        locationid  : 58278,\n        rotation    : 0,\n        displaytype : 1,\n        sdktype     : \"0\",\n        scheduleid  : 512601\n      };\n    <\/script>\n    <style>\n      body {\n        margin:0;\n        padding:0;\n      }\n    <\/style>\n  <\/head>\n  <body>\n    <div id=\"medibasspContainer\">\n      <iframe src=\"https:\/\/s3-ap-northeast-1.amazonaws.com\/sdk-temp\/adg-sample-ad\/300x250.html?prc=-Cuepak&rd=https%3A%2F%2Ftg.socdm.com%2Frd%2Fv1%2Fz%2FhKFj2gDXY2hzbT0xOTgsZmJkZGMyNWEvNTgyNzgvU1NQTE9DLzUxMjYwMS83MjExNS43Njg1NS41MTI2MDEvMTA5MzkyNi82NDkxOS81ODI3ODpTU1BMT0M6Ki9jdD0xNTg1MjEyMDg1Nzg5O3NyPWh0dHBzO2RzcGlkPTMwMTtwcj16RGFfYVY0O3ByYj15UTtwcm89eVE7cHJvYz1KUFk7Y3JkMnk9MTA5LjQzMDAwMDAwMDAwMDAxO2NyeTJkPTAuMDA5MTM4MjYxOTAyNTg2MTI3MztpZHg9MDulc2VxaWTaACQ0NzFhM2JlNS1lYTQzLWRhZjAtYjhjZi1mNjJkNTA1N2Y5ZWOnc2VxdGltZa0xNTg1MjEyMDg1Nzg5pHh1aWS4WE52SVNNQ281bUlBQU1hN2dOUUFBQUFB%2Fp%2Fctsv%3Dm-ad226%3Bseqid%3D471a3be5-ea43-daf0-b8cf-f62d5057f9ec%3B%2Fg%2FU%3A%3Furl%3D\" style=\"border: 0px;\" width=\"300\" height=\"250\" frameborder=\"0\" scrolling=\"no\"><\/iframe>\n    <\/div>\n  <\/body>\n",
+                            "beacon": "<img src=\"https://tg.socdm.com/bc/v3?b=beaconID&amp;xuid=XUID&amp;ctsv=CTSV&amp;seqid=SeqID&amp;seqtime=SeqTime&amp;seqctx=SeqCtx&amp;t=.gif\" width=\"1\" height=\"1\" style=\"display:none;border:none;padding:0;margin:0;width:1px;height:1px\"/>",
+                            "beaconurl": "https://tg.socdm.com/bc/v3?b=beaconID&t=.gif",
+                            "cpm": 46.6,
+                            "creativeid": "Dummy_supership.jp",
+                            "h": 250,
+                            "landing_url": "",
+                            "scheduleid": "512601",
+                            "trackers": {
+                                "imp": [
+                                    "https://tg.socdm.com/bc/v3?b=beaconID&t=.gif"
+                                ],
+                                "viewable_imp": [
+                                    "https://tg.socdm.com/aux/inview?creative_id=1093926&ctsv=CTSC&extra_field=ExtraField&family_id=512601&id=58278&loglocation_id=64919&lookupname=58278%3ASSPLOC%3A*&pos=SSPLOC&schedule_id=72115.76855.512601&seqid=SeqID&seqtime=SeqTime&xuid=XUID"
+                                ],
+                                "viewable_measured": [
+                                    "https://tg.socdm.com/aux/measured?creative_id=1093926&ctsv=CTSC&extra_field=ExtraField&family_id=512601&id=58278&loglocation_id=64919&lookupname=58278%3ASSPLOC%3A*&pos=SSPLOC&schedule_id=72115.76855.512601&seqid=SeqID&seqtime=SeqTime&xuid=XUID"
+                                ]
+                            },
+                            "ttl": 10,
+                            "w": 300,
+                            "weight": 1
+                        }
+                    ],
+                    "dealid": "test-deal-id",
+                    "rotation": "0",
+                    "scheduleid": "512601",
+                    "sdktype": "0",
+                    "trackers": {
+                        "imp": [
+                            "https://tg.socdm.com/bc/v3?b=beaconID&t=.gif"
+                        ],
+                        "viewable_imp": [
+                            "https://tg.socdm.com/aux/inview?creative_id=1093926&ctsv=CTSC&extra_field=ExtraField&family_id=512601&id=58278&loglocation_id=64919&lookupname=58278%3ASSPLOC%3A*&pos=SSPLOC&schedule_id=72115.76855.512601&seqid=SeqID&seqtime=SeqTime&xuid=XUID"
+                        ],
+                        "viewable_measured": [
+                            "https://tg.socdm.com/aux/measured?creative_id=1093926&ctsv=CTSC&extra_field=ExtraField&family_id=512601&id=58278&loglocation_id=64919&lookupname=58278%3ASSPLOC%3A*&pos=SSPLOC&schedule_id=72115.76855.512601&seqid=SeqID&seqtime=SeqTime&xuid=XUID"
+                        ]
+                    },
+                    "ttl": 10,
+                    "w": 300
+                }
+            }
+        }
+    ],
+    "expectedBidResponses": [
+        {
+          "currency": "JPY",
+          "bids": [
+            {
+              "bid": {
+                "id": "58278",
+                "impid": "some-impression-id",
+                "price": 46.6,
+                "adm": "<div id=\"medibasspContainer\">\n      <iframe src=\"https:\/\/s3-ap-northeast-1.amazonaws.com\/sdk-temp\/adg-sample-ad\/300x250.html?prc=-Cuepak&rd=https%3A%2F%2Ftg.socdm.com%2Frd%2Fv1%2Fz%2FhKFj2gDXY2hzbT0xOTgsZmJkZGMyNWEvNTgyNzgvU1NQTE9DLzUxMjYwMS83MjExNS43Njg1NS41MTI2MDEvMTA5MzkyNi82NDkxOS81ODI3ODpTU1BMT0M6Ki9jdD0xNTg1MjEyMDg1Nzg5O3NyPWh0dHBzO2RzcGlkPTMwMTtwcj16RGFfYVY0O3ByYj15UTtwcm89eVE7cHJvYz1KUFk7Y3JkMnk9MTA5LjQzMDAwMDAwMDAwMDAxO2NyeTJkPTAuMDA5MTM4MjYxOTAyNTg2MTI3MztpZHg9MDulc2VxaWTaACQ0NzFhM2JlNS1lYTQzLWRhZjAtYjhjZi1mNjJkNTA1N2Y5ZWOnc2VxdGltZa0xNTg1MjEyMDg1Nzg5pHh1aWS4WE52SVNNQ281bUlBQU1hN2dOUUFBQUFB%2Fp%2Fctsv%3Dm-ad226%3Bseqid%3D471a3be5-ea43-daf0-b8cf-f62d5057f9ec%3B%2Fg%2FU%3A%3Furl%3D\" style=\"border: 0px;\" width=\"300\" height=\"250\" frameborder=\"0\" scrolling=\"no\"><\/iframe>\n    <\/div>\n  <img src=\"https://tg.socdm.com/bc/v3?b=beaconID&amp;xuid=XUID&amp;ctsv=CTSV&amp;seqid=SeqID&amp;seqtime=SeqTime&amp;seqctx=SeqCtx&amp;t=.gif\" width=\"1\" height=\"1\" style=\"display:none;border:none;padding:0;margin:0;width:1px;height:1px\"/>",
+                "crid": "Dummy_supership.jp",
+                "w": 300,
+                "h": 250,
+                "dealid": "test-deal-id"
+              },
+              "type": "banner"
+            }
+          ]
+        }
+      ]
+}
+
diff --git a/adapters/adgeneration/adgenerationtest/exemplary/single-banner-ios.json b/adapters/adgeneration/adgenerationtest/exemplary/single-banner-ios.json
new file mode 100644
index 00000000000..e0ff64c453d
--- /dev/null
+++ b/adapters/adgeneration/adgenerationtest/exemplary/single-banner-ios.json
@@ -0,0 +1,166 @@
+{
+    "mockBidRequest":{
+        "id": "some-request-id",
+        "site": {
+            "page": "http://example.com/test.html"
+        },
+        "device": {
+            "ua": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.83 Safari/537.36",
+            "ip": "0.0.0.0",
+            "os": "ios",
+            "ifa": "idfa"
+        },
+        "app": {
+            "bundle": "adgneration"
+        },
+        "imp": [
+            {
+                "id": "some-impression-id",
+                "banner": {
+                    "format": [
+                        {
+                            "w": 300,
+                            "h": 250
+                        }
+                    ]
+                },
+                "ext": {
+                    "bidder": {
+                        "id": "58278"
+                    }
+                }
+            }
+        ],
+        "tmax": 500
+    },
+    "httpCalls": [
+        {
+            "internalRequest": {
+                "id": "some-request-id",
+                "site": {
+                    "page": "http://example.com/test.html"
+                },
+                "imp": [
+                    {
+                        "id": "some-impression-id",
+                        "banner": {
+                            "format": [
+                                {
+                                    "w": 300,
+                                    "h": 250
+                                }
+                            ]
+                        },
+                        "ext": {
+                            "bidder": {
+                                "id": "58278"
+                            }
+                        }
+                    }
+                ],
+                "tmax": 500
+            },
+            "expectedRequest":{
+                "uri": "https://d.socdm.com/adsv/v1?adapterver=1.0.3&appbundle=adgneration&currency=JPY&hb=true&id=58278&idfa=idfa&posall=SSPLOC&sdkname=prebidserver&sdktype=2&sizes=300x250&t=json3&tp=http%3A%2F%2Fexample.com%2Ftest.html",
+                "headers": {
+                    "Accept": [
+                        "application/json"
+                    ],
+                    "Content-Type": [
+                        "application/json;charset=utf-8"
+                    ],
+                    "User-Agent": [
+                        "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.83 Safari/537.36"
+                    ],
+                    "X-Forwarded-For": [
+                        "0.0.0.0"
+                    ]
+                }
+            },
+            "mockResponse":{
+                "status": 200,
+                "body": {
+                    "ad": "<!DOCTYPE html>\n  <head>\n    <meta charset=\"UTF-8\">\n    <script src=\"https:\/\/i.socdm.com\/sdk\/js\/adg-script-base.js\" type=\"text\/javascript\"><\/script>\n    <script type=\"text\/javascript\">\n      adsettings = {\n        locationid  : 58278,\n        rotation    : 0,\n        displaytype : 1,\n        sdktype     : \"0\",\n        scheduleid  : 512601\n      };\n    <\/script>\n    <style>\n      body {\n        margin:0;\n        padding:0;\n      }\n    <\/style>\n  <\/head>\n  <body>\n    <div id=\"medibasspContainer\">\n      <iframe src=\"https:\/\/s3-ap-northeast-1.amazonaws.com\/sdk-temp\/adg-sample-ad\/300x250.html?prc=-Cuepak&rd=https%3A%2F%2Ftg.socdm.com%2Frd%2Fv1%2Fz%2FhKFj2gDXY2hzbT0xOTgsZmJkZGMyNWEvNTgyNzgvU1NQTE9DLzUxMjYwMS83MjExNS43Njg1NS41MTI2MDEvMTA5MzkyNi82NDkxOS81ODI3ODpTU1BMT0M6Ki9jdD0xNTg1MjEyMDg1Nzg5O3NyPWh0dHBzO2RzcGlkPTMwMTtwcj16RGFfYVY0O3ByYj15UTtwcm89eVE7cHJvYz1KUFk7Y3JkMnk9MTA5LjQzMDAwMDAwMDAwMDAxO2NyeTJkPTAuMDA5MTM4MjYxOTAyNTg2MTI3MztpZHg9MDulc2VxaWTaACQ0NzFhM2JlNS1lYTQzLWRhZjAtYjhjZi1mNjJkNTA1N2Y5ZWOnc2VxdGltZa0xNTg1MjEyMDg1Nzg5pHh1aWS4WE52SVNNQ281bUlBQU1hN2dOUUFBQUFB%2Fp%2Fctsv%3Dm-ad226%3Bseqid%3D471a3be5-ea43-daf0-b8cf-f62d5057f9ec%3B%2Fg%2FU%3A%3Furl%3D\" style=\"border: 0px;\" width=\"300\" height=\"250\" frameborder=\"0\" scrolling=\"no\"><\/iframe>\n    <\/div>\n  <\/body>\n",
+                    "beacon": "<img src=\"https://tg.socdm.com/bc/v3?b=beaconID&amp;xuid=XUID&amp;ctsv=CTSV&amp;seqid=SeqID&amp;seqtime=SeqTime&amp;seqctx=SeqCtx&amp;t=.gif\" width=\"1\" height=\"1\" style=\"display:none;border:none;padding:0;margin:0;width:1px;height:1px\"/>",
+                    "beaconurl": "https://tg.socdm.com/bc/v3?b=beaconID&t=.gif",
+                    "cpm": 46.6,
+                    "creativeid": "Dummy_supership.jp",
+                    "displaytype": "1",
+                    "h": 250,
+                    "ids": {
+                        "anid": "",
+                        "diid": "",
+                        "idfa": "",
+                        "soc": "Soc"
+                    },
+                    "location_params": null,
+                    "locationid": "58278",
+                    "results": [
+                        {
+                            "ad": "<!DOCTYPE html>\n  <head>\n    <meta charset=\"UTF-8\">\n    <script src=\"https:\/\/i.socdm.com\/sdk\/js\/adg-script-base.js\" type=\"text\/javascript\"><\/script>\n    <script type=\"text\/javascript\">\n      adsettings = {\n        locationid  : 58278,\n        rotation    : 0,\n        displaytype : 1,\n        sdktype     : \"0\",\n        scheduleid  : 512601\n      };\n    <\/script>\n    <style>\n      body {\n        margin:0;\n        padding:0;\n      }\n    <\/style>\n  <\/head>\n  <body>\n    <div id=\"medibasspContainer\">\n      <iframe src=\"https:\/\/s3-ap-northeast-1.amazonaws.com\/sdk-temp\/adg-sample-ad\/300x250.html?prc=-Cuepak&rd=https%3A%2F%2Ftg.socdm.com%2Frd%2Fv1%2Fz%2FhKFj2gDXY2hzbT0xOTgsZmJkZGMyNWEvNTgyNzgvU1NQTE9DLzUxMjYwMS83MjExNS43Njg1NS41MTI2MDEvMTA5MzkyNi82NDkxOS81ODI3ODpTU1BMT0M6Ki9jdD0xNTg1MjEyMDg1Nzg5O3NyPWh0dHBzO2RzcGlkPTMwMTtwcj16RGFfYVY0O3ByYj15UTtwcm89eVE7cHJvYz1KUFk7Y3JkMnk9MTA5LjQzMDAwMDAwMDAwMDAxO2NyeTJkPTAuMDA5MTM4MjYxOTAyNTg2MTI3MztpZHg9MDulc2VxaWTaACQ0NzFhM2JlNS1lYTQzLWRhZjAtYjhjZi1mNjJkNTA1N2Y5ZWOnc2VxdGltZa0xNTg1MjEyMDg1Nzg5pHh1aWS4WE52SVNNQ281bUlBQU1hN2dOUUFBQUFB%2Fp%2Fctsv%3Dm-ad226%3Bseqid%3D471a3be5-ea43-daf0-b8cf-f62d5057f9ec%3B%2Fg%2FU%3A%3Furl%3D\" style=\"border: 0px;\" width=\"300\" height=\"250\" frameborder=\"0\" scrolling=\"no\"><\/iframe>\n    <\/div>\n  <\/body>\n",
+                            "beacon": "<img src=\"https://tg.socdm.com/bc/v3?b=beaconID&amp;xuid=XUID&amp;ctsv=CTSV&amp;seqid=SeqID&amp;seqtime=SeqTime&amp;seqctx=SeqCtx&amp;t=.gif\" width=\"1\" height=\"1\" style=\"display:none;border:none;padding:0;margin:0;width:1px;height:1px\"/>",
+                            "beaconurl": "https://tg.socdm.com/bc/v3?b=beaconID&t=.gif",
+                            "cpm": 46.6,
+                            "creativeid": "Dummy_supership.jp",
+                            "h": 250,
+                            "landing_url": "",
+                            "scheduleid": "512601",
+                            "trackers": {
+                                "imp": [
+                                    "https://tg.socdm.com/bc/v3?b=beaconID&t=.gif"
+                                ],
+                                "viewable_imp": [
+                                    "https://tg.socdm.com/aux/inview?creative_id=1093926&ctsv=CTSC&extra_field=ExtraField&family_id=512601&id=58278&loglocation_id=64919&lookupname=58278%3ASSPLOC%3A*&pos=SSPLOC&schedule_id=72115.76855.512601&seqid=SeqID&seqtime=SeqTime&xuid=XUID"
+                                ],
+                                "viewable_measured": [
+                                    "https://tg.socdm.com/aux/measured?creative_id=1093926&ctsv=CTSC&extra_field=ExtraField&family_id=512601&id=58278&loglocation_id=64919&lookupname=58278%3ASSPLOC%3A*&pos=SSPLOC&schedule_id=72115.76855.512601&seqid=SeqID&seqtime=SeqTime&xuid=XUID"
+                                ]
+                            },
+                            "ttl": 10,
+                            "w": 300,
+                            "weight": 1
+                        }
+                    ],
+                    "dealid": "test-deal-id",
+                    "rotation": "0",
+                    "scheduleid": "512601",
+                    "sdktype": "0",
+                    "trackers": {
+                        "imp": [
+                            "https://tg.socdm.com/bc/v3?b=beaconID&t=.gif"
+                        ],
+                        "viewable_imp": [
+                            "https://tg.socdm.com/aux/inview?creative_id=1093926&ctsv=CTSC&extra_field=ExtraField&family_id=512601&id=58278&loglocation_id=64919&lookupname=58278%3ASSPLOC%3A*&pos=SSPLOC&schedule_id=72115.76855.512601&seqid=SeqID&seqtime=SeqTime&xuid=XUID"
+                        ],
+                        "viewable_measured": [
+                            "https://tg.socdm.com/aux/measured?creative_id=1093926&ctsv=CTSC&extra_field=ExtraField&family_id=512601&id=58278&loglocation_id=64919&lookupname=58278%3ASSPLOC%3A*&pos=SSPLOC&schedule_id=72115.76855.512601&seqid=SeqID&seqtime=SeqTime&xuid=XUID"
+                        ]
+                    },
+                    "ttl": 10,
+                    "w": 300
+                }
+            }
+        }
+    ],
+    "expectedBidResponses": [
+        {
+          "currency": "JPY",
+          "bids": [
+            {
+              "bid": {
+                "id": "58278",
+                "impid": "some-impression-id",
+                "price": 46.6,
+                "adm": "<div id=\"medibasspContainer\">\n      <iframe src=\"https:\/\/s3-ap-northeast-1.amazonaws.com\/sdk-temp\/adg-sample-ad\/300x250.html?prc=-Cuepak&rd=https%3A%2F%2Ftg.socdm.com%2Frd%2Fv1%2Fz%2FhKFj2gDXY2hzbT0xOTgsZmJkZGMyNWEvNTgyNzgvU1NQTE9DLzUxMjYwMS83MjExNS43Njg1NS41MTI2MDEvMTA5MzkyNi82NDkxOS81ODI3ODpTU1BMT0M6Ki9jdD0xNTg1MjEyMDg1Nzg5O3NyPWh0dHBzO2RzcGlkPTMwMTtwcj16RGFfYVY0O3ByYj15UTtwcm89eVE7cHJvYz1KUFk7Y3JkMnk9MTA5LjQzMDAwMDAwMDAwMDAxO2NyeTJkPTAuMDA5MTM4MjYxOTAyNTg2MTI3MztpZHg9MDulc2VxaWTaACQ0NzFhM2JlNS1lYTQzLWRhZjAtYjhjZi1mNjJkNTA1N2Y5ZWOnc2VxdGltZa0xNTg1MjEyMDg1Nzg5pHh1aWS4WE52SVNNQ281bUlBQU1hN2dOUUFBQUFB%2Fp%2Fctsv%3Dm-ad226%3Bseqid%3D471a3be5-ea43-daf0-b8cf-f62d5057f9ec%3B%2Fg%2FU%3A%3Furl%3D\" style=\"border: 0px;\" width=\"300\" height=\"250\" frameborder=\"0\" scrolling=\"no\"><\/iframe>\n    <\/div>\n  <img src=\"https://tg.socdm.com/bc/v3?b=beaconID&amp;xuid=XUID&amp;ctsv=CTSV&amp;seqid=SeqID&amp;seqtime=SeqTime&amp;seqctx=SeqCtx&amp;t=.gif\" width=\"1\" height=\"1\" style=\"display:none;border:none;padding:0;margin:0;width:1px;height:1px\"/>",
+                "crid": "Dummy_supership.jp",
+                "w": 300,
+                "h": 250,
+                "dealid": "test-deal-id"
+              },
+              "type": "banner"
+            }
+          ]
+        }
+      ]
+}
+
diff --git a/adapters/adgeneration/adgenerationtest/exemplary/single-banner.json b/adapters/adgeneration/adgenerationtest/exemplary/single-banner.json
index 655f6b75f91..cd68e32cd09 100644
--- a/adapters/adgeneration/adgenerationtest/exemplary/single-banner.json
+++ b/adapters/adgeneration/adgenerationtest/exemplary/single-banner.json
@@ -5,7 +5,11 @@
             "page": "http://example.com/test.html"
         },
         "device": {
-            "ua": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.83 Safari/537.36"
+            "ua": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.83 Safari/537.36",
+            "ip": "0.0.0.0"
+        },
+        "source": {
+            "TID": "transactionid"
         },
         "imp": [
             {
@@ -55,7 +59,7 @@
                 "tmax": 500
             },
             "expectedRequest":{
-                "uri": "https://d.socdm.com/adsv/v1?adapterver=1.0.2&currency=JPY&hb=true&id=58278&posall=SSPLOC&sdkname=prebidserver&sdktype=0&sizes=300x250&t=json3&tp=http%3A%2F%2Fexample.com%2Ftest.html",
+                "uri": "https://d.socdm.com/adsv/v1?adapterver=1.0.3&currency=JPY&hb=true&id=58278&posall=SSPLOC&sdkname=prebidserver&sdktype=0&sizes=300x250&t=json3&tp=http%3A%2F%2Fexample.com%2Ftest.html&transactionid=transactionid",
                 "headers": {
                     "Accept": [
                         "application/json"
@@ -65,6 +69,9 @@
                     ],
                     "User-Agent": [
                         "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.83 Safari/537.36"
+                    ],
+                    "X-Forwarded-For": [
+                        "0.0.0.0"
                     ]
                 }
             },
diff --git a/adapters/adgeneration/adgenerationtest/supplemental/204-bid-response.json b/adapters/adgeneration/adgenerationtest/supplemental/204-bid-response.json
index b9a79688d40..8d1ab442154 100644
--- a/adapters/adgeneration/adgenerationtest/supplemental/204-bid-response.json
+++ b/adapters/adgeneration/adgenerationtest/supplemental/204-bid-response.json
@@ -55,7 +55,7 @@
                 "tmax": 500
             },
             "expectedRequest":{
-                "uri": "https://d.socdm.com/adsv/v1?adapterver=1.0.2&currency=JPY&hb=true&id=58278&posall=SSPLOC&sdkname=prebidserver&sdktype=0&sizes=300x250&t=json3&tp=http%3A%2F%2Fexample.com%2Ftest.html",
+                "uri": "https://d.socdm.com/adsv/v1?adapterver=1.0.3&currency=JPY&hb=true&id=58278&posall=SSPLOC&sdkname=prebidserver&sdktype=0&sizes=300x250&t=json3&tp=http%3A%2F%2Fexample.com%2Ftest.html",
                 "headers": {
                     "Accept": [
                         "application/json"
diff --git a/adapters/adgeneration/adgenerationtest/supplemental/400-bid-response.json b/adapters/adgeneration/adgenerationtest/supplemental/400-bid-response.json
index 9744e8d2606..dc7c41d0f6b 100644
--- a/adapters/adgeneration/adgenerationtest/supplemental/400-bid-response.json
+++ b/adapters/adgeneration/adgenerationtest/supplemental/400-bid-response.json
@@ -55,7 +55,7 @@
                 "tmax": 500
             },
             "expectedRequest":{
-                "uri": "https://d.socdm.com/adsv/v1?adapterver=1.0.2&currency=JPY&hb=true&id=58278&posall=SSPLOC&sdkname=prebidserver&sdktype=0&sizes=300x250&t=json3&tp=http%3A%2F%2Fexample.com%2Ftest.html",
+                "uri": "https://d.socdm.com/adsv/v1?adapterver=1.0.3&currency=JPY&hb=true&id=58278&posall=SSPLOC&sdkname=prebidserver&sdktype=0&sizes=300x250&t=json3&tp=http%3A%2F%2Fexample.com%2Ftest.html",
                 "headers": {
                     "Accept": [
                         "application/json"
diff --git a/adapters/adgeneration/adgenerationtest/supplemental/no-bid-response.json b/adapters/adgeneration/adgenerationtest/supplemental/no-bid-response.json
index 3b3bc82a4ce..523806a9f3c 100644
--- a/adapters/adgeneration/adgenerationtest/supplemental/no-bid-response.json
+++ b/adapters/adgeneration/adgenerationtest/supplemental/no-bid-response.json
@@ -55,7 +55,7 @@
                 "tmax": 500
             },
             "expectedRequest":{
-                "uri": "https://d.socdm.com/adsv/v1?adapterver=1.0.2&currency=JPY&hb=true&id=58278&posall=SSPLOC&sdkname=prebidserver&sdktype=0&sizes=300x250&t=json3&tp=http%3A%2F%2Fexample.com%2Ftest.html",
+                "uri": "https://d.socdm.com/adsv/v1?adapterver=1.0.3&currency=JPY&hb=true&id=58278&posall=SSPLOC&sdkname=prebidserver&sdktype=0&sizes=300x250&t=json3&tp=http%3A%2F%2Fexample.com%2Ftest.html",
                 "headers": {
                     "Accept": [
                         "application/json"
diff --git a/adapters/adnuntius/adnuntius.go b/adapters/adnuntius/adnuntius.go
index f556081ae70..da66e4433ec 100644
--- a/adapters/adnuntius/adnuntius.go
+++ b/adapters/adnuntius/adnuntius.go
@@ -74,10 +74,19 @@ func (a *adapter) MakeRequests(request *openrtb2.BidRequest, reqInfo *adapters.E
 	return a.generateRequests(*request)
 }
 
-func setHeaders() http.Header {
+func setHeaders(ortbRequest openrtb2.BidRequest) http.Header {
+
 	headers := http.Header{}
 	headers.Add("Content-Type", "application/json;charset=utf-8")
 	headers.Add("Accept", "application/json")
+	if ortbRequest.Device != nil {
+		if ortbRequest.Device.IP != "" {
+			headers.Add("X-Forwarded-For", ortbRequest.Device.IP)
+		}
+		if ortbRequest.Device.UA != "" {
+			headers.Add("user-agent", ortbRequest.Device.UA)
+		}
+	}
 	return headers
 }
 
@@ -113,7 +122,7 @@ func makeEndpointUrl(ortbRequest openrtb2.BidRequest, a *adapter) (string, []err
 func (a *adapter) generateRequests(ortbRequest openrtb2.BidRequest) ([]*adapters.RequestData, []error) {
 	var requestData []*adapters.RequestData
 	networkAdunitMap := make(map[string][]adnAdunit)
-	headers := setHeaders()
+	headers := setHeaders(ortbRequest)
 
 	endpoint, err := makeEndpointUrl(ortbRequest, a)
 	if err != nil {
diff --git a/adapters/adnuntius/adnuntiustest/supplemental/send-header-information.json b/adapters/adnuntius/adnuntiustest/supplemental/send-header-information.json
new file mode 100644
index 00000000000..96ddff858ac
--- /dev/null
+++ b/adapters/adnuntius/adnuntiustest/supplemental/send-header-information.json
@@ -0,0 +1,122 @@
+{
+    "mockBidRequest": {
+        "id": "test-request-id",
+        "user": {
+            "id": "1kjh3429kjh295jkl",
+            "ext": {
+                "consent": "CONSENT_STRING"
+            }
+        },
+        "device": {
+            "ip": "158.174.81.143",
+            "ua": "Mozilla/5.0 (Linux; Android 8.0; Pixel 2 Build/OPD3.170816.012) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.93 Mobile Safari/537.36"
+        },
+        "imp": [
+            {
+                "id": "test-imp-id",
+                "banner": {
+                    "format": [
+                        {
+                            "w": 300,
+                            "h": 250
+                        },
+                        {
+                            "w": 300,
+                            "h": 600
+                        }
+                    ]
+                },
+                "ext": {
+                    "bidder": {
+                        "auId": "123"
+                    }
+                }
+            }
+        ]
+    },
+
+    "httpCalls": [
+        {
+            "expectedRequest": {
+                "headers": {
+                    "Content-Type": [
+                        "application/json;charset=utf-8"
+                    ],
+                    "Accept": [
+                        "application/json"
+                    ],
+                    "X-Forwarded-For": [
+                        "158.174.81.143"
+                    ],
+                    "User-Agent": [
+                        "Mozilla/5.0 (Linux; Android 8.0; Pixel 2 Build/OPD3.170816.012) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.93 Mobile Safari/537.36"
+                    ]
+                },
+                "uri": "http://whatever.url?format=json&tzo=0",
+                "body": {
+                    "adUnits": [
+                        {
+                            "auId": "123",
+                            "targetId": "123-test-imp-id"
+                        }
+                    ],
+                    "metaData": {
+                        "usi": "1kjh3429kjh295jkl"
+                    },
+                    "context": "unknown"
+                }
+            },
+            "mockResponse": {
+                "status": 200,
+                "body": {
+                    "adUnits": [
+                        {
+                            "auId": "0000000000000123",
+                            "targetId": "123-test-imp-id",
+                            "html": "<ADCODE>",
+                            "responseId": "adn-rsp-900646517",
+                            "ads": [
+                                {
+                                    "destinationUrls": {
+                                        "url": "http://www.google.com"
+                                    },
+                                    "bid": {
+                                        "amount": 20.0,
+                                        "currency": "NOK"
+                                    },
+                                    "adId": "adn-id-1559784094",
+                                    "creativeWidth": "980",
+                                    "creativeHeight": "240",
+                                    "creativeId": "jn9hpzvlsf8cpdmm",
+                                    "lineItemId": "q7y9qm5b0xt9htrv"
+                                }
+                            ]
+                        }
+                    ]
+                }
+            }
+        }
+    ],
+    "expectedBidResponses": [
+        {
+            "bids": [
+                {
+                    "bid": {
+                        "id": "adn-id-1559784094",
+                        "impid": "test-imp-id",
+                        "price": 20000,
+                        "adm": "<ADCODE>",
+                        "adid": "adn-id-1559784094",
+                        "adomain": ["google.com"],
+                        "cid": "q7y9qm5b0xt9htrv",
+                        "crid": "jn9hpzvlsf8cpdmm",
+                        "w": 980,
+                        "h": 240
+                    },
+                    "type": "banner"
+                }
+            ],
+            "currency": "NOK"
+        }
+    ]
+}
diff --git a/adapters/adot/adot.go b/adapters/adot/adot.go
index f41beed8d21..5f99cf84518 100644
--- a/adapters/adot/adot.go
+++ b/adapters/adot/adot.go
@@ -4,6 +4,8 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
+	"strconv"
+	"strings"
 
 	"github.com/mxmCherry/openrtb/v15/openrtb2"
 	"github.com/prebid/prebid-server/adapters"
@@ -85,6 +87,7 @@ func (a *adapter) MakeBids(internalRequest *openrtb2.BidRequest, externalRequest
 	for _, sb := range bidResp.SeatBid {
 		for i := range sb.Bid {
 			if bidType, err := getMediaTypeForBid(&sb.Bid[i]); err == nil {
+				resolveMacros(&sb.Bid[i])
 				bidResponse.Bids = append(bidResponse.Bids, &adapters.TypedBid{
 					Bid:     &sb.Bid[i],
 					BidType: bidType,
@@ -116,3 +119,13 @@ func getMediaTypeForBid(bid *openrtb2.Bid) (openrtb_ext.BidType, error) {
 
 	return "", fmt.Errorf("unrecognized bid type in response from adot")
 }
+
+// resolveMacros resolves OpenRTB macros in nurl and adm
+func resolveMacros(bid *openrtb2.Bid) {
+	if bid == nil {
+		return
+	}
+	price := strconv.FormatFloat(bid.Price, 'f', -1, 64)
+	bid.NURL = strings.Replace(bid.NURL, "${AUCTION_PRICE}", price, -1)
+	bid.AdM = strings.Replace(bid.AdM, "${AUCTION_PRICE}", price, -1)
+}
diff --git a/adapters/adot/adot_test.go b/adapters/adot/adot_test.go
index fbc7def4a74..3e0944b6e03 100644
--- a/adapters/adot/adot_test.go
+++ b/adapters/adot/adot_test.go
@@ -25,7 +25,6 @@ func TestJsonSamples(t *testing.T) {
 	adapterstest.RunJSONBidderTest(t, "adottest", bidder)
 }
 
-//Test the media type error
 func TestMediaTypeError(t *testing.T) {
 	_, err := getMediaTypeForBid(nil)
 
@@ -37,7 +36,6 @@ func TestMediaTypeError(t *testing.T) {
 	assert.Error(t, err)
 }
 
-//Test the bid response when the bidder return a status code 204
 func TestBidResponseNoContent(t *testing.T) {
 	bidder, buildErr := Builder(openrtb_ext.BidderAdot, config.Adapter{
 		Endpoint: "https://dsp.adotmob.com/headerbidding/bidrequest"})
@@ -54,7 +52,6 @@ func TestBidResponseNoContent(t *testing.T) {
 	}
 }
 
-//Test the media type for a bid response
 func TestMediaTypeForBid(t *testing.T) {
 	byteBanner, _ := json.Marshal(&adotBidExt{Adot: bidExt{"banner"}})
 	byteVideo, _ := json.Marshal(&adotBidExt{Adot: bidExt{"video"}})
@@ -75,3 +72,10 @@ func TestMediaTypeForBid(t *testing.T) {
 		t.Errorf("the type is not the valid one. actual: %v, expected: %v", bidTypeNative, openrtb_ext.BidTypeVideo)
 	}
 }
+
+func TestResolveMacros(t *testing.T) {
+	bid := &openrtb2.Bid{AdM: "adm:imp_${AUCTION_PRICE} amd:creativeview_${AUCTION_PRICE}", NURL: "nurl_${AUCTION_PRICE}", Price: 123.45}
+	resolveMacros(bid)
+	assert.Equal(t, "adm:imp_123.45 amd:creativeview_123.45", bid.AdM)
+	assert.Equal(t, "nurl_123.45", bid.NURL)
+}
diff --git a/adapters/adot/adottest/exemplary/simple-banner.json b/adapters/adot/adottest/exemplary/simple-banner.json
index 1b8cb9867f6..185addfcaef 100644
--- a/adapters/adot/adottest/exemplary/simple-banner.json
+++ b/adapters/adot/adottest/exemplary/simple-banner.json
@@ -55,7 +55,8 @@
             "id": "test-request-banner-id",
             "impid": "test-imp-banner-id",
             "price": 1.16346,
-            "adm": "some-test-ad",
+            "adm": "some-test-ad imp_${AUCTION_PRICE} creativeview_${AUCTION_PRICE}",
+            "nurl": "nurl.link/win?p=${AUCTION_PRICE}",
             "w": 320,
             "h": 50,
             "ext": {
@@ -78,7 +79,8 @@
             "id": "test-request-banner-id",
             "impid": "test-imp-banner-id",
             "price": 1.16346,
-            "adm": "some-test-ad",
+            "adm": "some-test-ad imp_1.16346 creativeview_1.16346",
+            "nurl": "nurl.link/win?p=1.16346",
             "w": 320,
             "h": 50,
             "ext": {
diff --git a/adapters/adot/adottest/exemplary/simple-interstitial.json b/adapters/adot/adottest/exemplary/simple-interstitial.json
index 0e9b573a530..09878984e76 100644
--- a/adapters/adot/adottest/exemplary/simple-interstitial.json
+++ b/adapters/adot/adottest/exemplary/simple-interstitial.json
@@ -58,8 +58,9 @@
               "bid": [{
                 "id": "test-request-inter-id",
                 "impid": "test-imp-inter-id",
-                "adm": "some-test-ad",
                 "price": 1.16346,
+                "adm": "some-test-ad imp_${AUCTION_PRICE} creativeview_${AUCTION_PRICE}",
+                "nurl": "nurl.link/win?p=${AUCTION_PRICE}",
                 "w": 320,
                 "h": 480,
                 "ext": {
@@ -82,8 +83,9 @@
             "bid": {
                 "id": "test-request-inter-id",
                 "impid": "test-imp-inter-id",
-                "price":  1.16346,
-                "adm": "some-test-ad",
+                "price": 1.16346,
+                "adm": "some-test-ad imp_1.16346 creativeview_1.16346",
+                "nurl": "nurl.link/win?p=1.16346",
                 "w": 320,
                 "h": 480,
                 "ext": {
diff --git a/adapters/adot/adottest/exemplary/simple-native.json b/adapters/adot/adottest/exemplary/simple-native.json
index 5fa3c70fd73..ad7bccff12a 100644
--- a/adapters/adot/adottest/exemplary/simple-native.json
+++ b/adapters/adot/adottest/exemplary/simple-native.json
@@ -45,7 +45,8 @@
                 "id": "test-request-native-id",
                 "impid": "test-imp-native-id",
                 "price": 1.16346,
-                "adm" : "native-ad",
+                "adm": "some-test-ad imp_${AUCTION_PRICE} creativeview_${AUCTION_PRICE}",
+                "nurl": "nurl.link/win?p=${AUCTION_PRICE}",
                 "w": 300,
                 "h": 250,
                 "ext": {
@@ -70,7 +71,8 @@
             "id": "test-request-native-id",
             "impid": "test-imp-native-id",
             "price": 1.16346,
-            "adm" : "native-ad",
+            "adm": "some-test-ad imp_1.16346 creativeview_1.16346",
+            "nurl": "nurl.link/win?p=1.16346",
             "w": 300,
             "h": 250,
             "ext": {
diff --git a/adapters/adot/adottest/exemplary/simple-video.json b/adapters/adot/adottest/exemplary/simple-video.json
index a453c4b9e18..4c85031863f 100644
--- a/adapters/adot/adottest/exemplary/simple-video.json
+++ b/adapters/adot/adottest/exemplary/simple-video.json
@@ -77,7 +77,8 @@
                 "id": "test-request-video-id",
                 "impid": "test-imp-video-id",
                 "price": 1.16346,
-                "adm": "some-test-ad",
+                "adm": "some-test-ad imp_${AUCTION_PRICE} creativeview_${AUCTION_PRICE}",
+                "nurl": "nurl.link/win?p=${AUCTION_PRICE}",
                 "w": 300,
                 "h": 250,
                 "ext": {
@@ -102,7 +103,8 @@
             "id": "test-request-video-id",
             "impid": "test-imp-video-id",
             "price": 1.16346,
-            "adm": "some-test-ad",
+            "adm": "some-test-ad imp_1.16346 creativeview_1.16346",
+            "nurl": "nurl.link/win?p=1.16346",
             "w": 300,
             "h": 250,
             "ext": {
diff --git a/adapters/adyoulike/adyoulike.go b/adapters/adyoulike/adyoulike.go
index 4cccd5dc5bc..17c42e4a5e9 100644
--- a/adapters/adyoulike/adyoulike.go
+++ b/adapters/adyoulike/adyoulike.go
@@ -2,16 +2,15 @@ package adyoulike
 
 import (
 	"encoding/json"
-	"errors"
 	"fmt"
-	"github.com/prebid/prebid-server/config"
-	"github.com/prebid/prebid-server/openrtb_ext"
 	"net/http"
 
 	"github.com/buger/jsonparser"
 	"github.com/mxmCherry/openrtb/v15/openrtb2"
 	"github.com/prebid/prebid-server/adapters"
+	"github.com/prebid/prebid-server/config"
 	"github.com/prebid/prebid-server/errortypes"
+	"github.com/prebid/prebid-server/openrtb_ext"
 )
 
 func Builder(bidderName openrtb_ext.BidderName, config config.Adapter) (adapters.Bidder, error) {
@@ -88,7 +87,7 @@ func (a *adapter) MakeBids(
 	case http.StatusOK:
 		break
 	case http.StatusNoContent:
-		return nil, []error{errors.New("MakeBids error: No Content")}
+		return nil, nil
 	case http.StatusBadRequest:
 		err := &errortypes.BadInput{
 			Message: fmt.Sprintf(unexpectedStatusCodeFormat, bidderRawResponse.StatusCode),
diff --git a/adapters/adyoulike/adyouliketest/supplemental/status-no-content.json b/adapters/adyoulike/adyouliketest/supplemental/status-no-content.json
index 9ef51e88a41..d7d7df19277 100644
--- a/adapters/adyoulike/adyouliketest/supplemental/status-no-content.json
+++ b/adapters/adyoulike/adyouliketest/supplemental/status-no-content.json
@@ -56,11 +56,5 @@
   ],
 
   "expectedBidResponses": [],
-
-  "expectedMakeBidsErrors": [
-    {
-      "value": "MakeBids error: No Content",
-      "comparison": "literal"
-    }
-  ]
+  "expectedMakeBidsErrors": []
 }
\ No newline at end of file
diff --git a/adapters/apacdex/apacdex.go b/adapters/apacdex/apacdex.go
new file mode 100644
index 00000000000..294b7188940
--- /dev/null
+++ b/adapters/apacdex/apacdex.go
@@ -0,0 +1,161 @@
+package apacdex
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+
+	"github.com/mxmCherry/openrtb/v15/openrtb2"
+	"github.com/prebid/prebid-server/adapters"
+	"github.com/prebid/prebid-server/config"
+	"github.com/prebid/prebid-server/errortypes"
+	"github.com/prebid/prebid-server/openrtb_ext"
+)
+
+type adapter struct {
+	endpoint string
+}
+
+// Builder builds a new instance of the Apacdex adapter for the given bidder with the given config.
+func Builder(bidderName openrtb_ext.BidderName, config config.Adapter) (adapters.Bidder, error) {
+	bidder := &adapter{
+		endpoint: config.Endpoint,
+	}
+	return bidder, nil
+}
+
+func (a *adapter) MakeRequests(request *openrtb2.BidRequest, requestInfo *adapters.ExtraRequestInfo) ([]*adapters.RequestData, []error) {
+	var errs []error
+	var adapterRequests []*adapters.RequestData
+
+	if err := preprocess(request); err != nil {
+		errs = append(errs, err)
+		return nil, errs
+	}
+
+	adapterReq, err := a.makeRequest(request)
+	if err != nil {
+		errs = append(errs, err)
+		return nil, errs
+	}
+
+	adapterRequests = append(adapterRequests, adapterReq)
+
+	return adapterRequests, errs
+}
+
+func (a *adapter) makeRequest(request *openrtb2.BidRequest) (*adapters.RequestData, error) {
+	var err error
+
+	jsonBody, err := json.Marshal(request)
+	if err != nil {
+		return nil, err
+	}
+
+	headers := http.Header{}
+	headers.Add("Content-Type", "application/json;charset=utf-8")
+	headers.Add("Accept", "application/json")
+	headers.Add("x-openrtb-version", "2.5")
+
+	return &adapters.RequestData{
+		Method:  "POST",
+		Uri:     a.endpoint,
+		Body:    jsonBody,
+		Headers: headers,
+	}, nil
+}
+
+func preprocess(request *openrtb2.BidRequest) error {
+	if len(request.Imp) == 0 {
+		return &errortypes.BadInput{
+			Message: "No Imps in Bid Request",
+		}
+	}
+	for i := 0; i < len(request.Imp); i++ {
+		var imp = &request.Imp[i]
+		var bidderExt adapters.ExtImpBidder
+
+		if err := json.Unmarshal(imp.Ext, &bidderExt); err != nil {
+			return &errortypes.BadInput{
+				Message: err.Error(),
+			}
+		}
+
+		var extImp openrtb_ext.ExtImpApacdex
+		if err := json.Unmarshal(bidderExt.Bidder, &extImp); err != nil {
+			return &errortypes.BadInput{
+				Message: err.Error(),
+			}
+		}
+
+		imp.Ext = bidderExt.Bidder
+	}
+
+	return nil
+}
+
+func (a *adapter) MakeBids(request *openrtb2.BidRequest, requestData *adapters.RequestData, responseData *adapters.ResponseData) (*adapters.BidderResponse, []error) {
+	if responseData.StatusCode == http.StatusNoContent {
+		return nil, nil
+	}
+
+	if responseData.StatusCode == http.StatusBadRequest {
+		err := &errortypes.BadInput{
+			Message: "Unexpected status code: 400. Bad request from publisher. Run with request.debug = 1 for more info.",
+		}
+		return nil, []error{err}
+	}
+
+	if responseData.StatusCode != http.StatusOK {
+		err := &errortypes.BadServerResponse{
+			Message: fmt.Sprintf("Unexpected status code: %d. Run with request.debug = 1 for more info.", responseData.StatusCode),
+		}
+		return nil, []error{err}
+	}
+
+	var response openrtb2.BidResponse
+
+	if err := json.Unmarshal(responseData.Body, &response); err != nil {
+		return nil, []error{&errortypes.BadServerResponse{
+			Message: err.Error(),
+		}}
+	}
+
+	if len(response.SeatBid) == 0 {
+		return nil, nil
+	}
+
+	bidResponse := adapters.NewBidderResponseWithBidsCapacity(len(request.Imp))
+	bidResponse.Currency = response.Cur
+	var errors []error
+
+	for _, seatbid := range response.SeatBid {
+		for _, bid := range seatbid.Bid {
+			bidType, err := getMediaTypeForBid(bid)
+			if err != nil {
+				errors = append(errors, err)
+				continue
+			}
+			bidResponse.Bids = append(bidResponse.Bids, &adapters.TypedBid{
+				Bid:     &bid,
+				BidType: bidType,
+			})
+		}
+	}
+	return bidResponse, errors
+}
+
+// getMediaTypeForBid determines which type of bid.
+func getMediaTypeForBid(bid openrtb2.Bid) (openrtb_ext.BidType, error) {
+	if bid.Ext != nil {
+		var bidExt openrtb_ext.ExtBid
+		err := json.Unmarshal(bid.Ext, &bidExt)
+		if err == nil && bidExt.Prebid != nil {
+			return openrtb_ext.ParseBidType(string(bidExt.Prebid.Type))
+		}
+	}
+
+	return "", &errortypes.BadServerResponse{
+		Message: fmt.Sprintf("Failed to parse bid mediatype for impression \"%s\"", bid.ImpID),
+	}
+}
diff --git a/adapters/valueimpression/valueimpression_test.go b/adapters/apacdex/apacdex_test.go
similarity index 65%
rename from adapters/valueimpression/valueimpression_test.go
rename to adapters/apacdex/apacdex_test.go
index f4d33864978..997302f6ea4 100644
--- a/adapters/valueimpression/valueimpression_test.go
+++ b/adapters/apacdex/apacdex_test.go
@@ -1,4 +1,4 @@
-package valueimpression
+package apacdex
 
 import (
 	"testing"
@@ -9,12 +9,12 @@ import (
 )
 
 func TestJsonSamples(t *testing.T) {
-	bidder, buildErr := Builder(openrtb_ext.BidderValueImpression, config.Adapter{
+	bidder, buildErr := Builder(openrtb_ext.BidderApacdex, config.Adapter{
 		Endpoint: "//host"})
 
 	if buildErr != nil {
 		t.Fatalf("Builder returned unexpected error %v", buildErr)
 	}
 
-	adapterstest.RunJSONBidderTest(t, "valueimpressiontest", bidder)
+	adapterstest.RunJSONBidderTest(t, "apacdextest", bidder)
 }
diff --git a/adapters/valueimpression/valueimpressiontest/exemplary/banner-and-video.json b/adapters/apacdex/apacdextest/exemplary/banner-and-video.json
similarity index 88%
rename from adapters/valueimpression/valueimpressiontest/exemplary/banner-and-video.json
rename to adapters/apacdex/apacdextest/exemplary/banner-and-video.json
index fd9d401cd44..78ce13fd106 100644
--- a/adapters/valueimpression/valueimpressiontest/exemplary/banner-and-video.json
+++ b/adapters/apacdex/apacdextest/exemplary/banner-and-video.json
@@ -92,7 +92,7 @@
           "id": "test-request-id",
           "seatbid": [
             {
-              "seat": "valueimpression",
+              "seat": "apacdex",
               "bid": [
                 {
                   "id": "8ee514f1-b2b8-4abb-89fd-084437d1e800",
@@ -101,7 +101,12 @@
                   "adm": "some-test-ad",
                   "crid": "crid_10",
                   "h": 250,
-                  "w": 300
+                  "w": 300,
+                  "ext": {
+                    "prebid": {
+                      "type": "video"
+                    }
+                  }
                 }
               ]
             }
@@ -121,7 +126,12 @@
           "adm": "some-test-ad",
           "crid": "crid_10",
           "w": 300,
-          "h": 250
+          "h": 250,
+          "ext": {
+            "prebid": {
+              "type": "video"
+            }
+          }
         },
         "type": "video"
       }
diff --git a/adapters/valueimpression/valueimpressiontest/exemplary/banner.json b/adapters/apacdex/apacdextest/exemplary/banner.json
similarity index 85%
rename from adapters/valueimpression/valueimpressiontest/exemplary/banner.json
rename to adapters/apacdex/apacdextest/exemplary/banner.json
index 1ef11ade199..31b685da15f 100644
--- a/adapters/valueimpression/valueimpressiontest/exemplary/banner.json
+++ b/adapters/apacdex/apacdextest/exemplary/banner.json
@@ -56,7 +56,7 @@
           "id": "test-request-id",
           "seatbid": [
             {
-              "seat": "valueimpression",
+              "seat": "apacdex",
               "bid": [
                 {
                   "id": "8ee514f1-b2b8-4abb-89fd-084437d1e800",
@@ -65,7 +65,12 @@
                   "adm": "some-test-ad",
                   "crid": "crid_10",
                   "h": 250,
-                  "w": 300
+                  "w": 300,
+                  "ext": {
+                    "prebid": {
+                      "type": "banner"
+                    }
+                  }
                 }
               ]
             }
@@ -87,7 +92,12 @@
             "adm": "some-test-ad",
             "crid": "crid_10",
             "w": 300,
-            "h": 250
+            "h": 250,
+            "ext": {
+              "prebid": {
+                "type": "banner"
+              }
+            }
           },
           "type": "banner"
         }
@@ -95,4 +105,3 @@
     }
   ]
 }
-  
\ No newline at end of file
diff --git a/adapters/valueimpression/valueimpressiontest/exemplary/video.json b/adapters/apacdex/apacdextest/exemplary/video.json
similarity index 100%
rename from adapters/valueimpression/valueimpressiontest/exemplary/video.json
rename to adapters/apacdex/apacdextest/exemplary/video.json
diff --git a/adapters/valueimpression/valueimpressiontest/supplemental/explicit-dimensions.json b/adapters/apacdex/apacdextest/supplemental/explicit-dimensions.json
similarity index 100%
rename from adapters/valueimpression/valueimpressiontest/supplemental/explicit-dimensions.json
rename to adapters/apacdex/apacdextest/supplemental/explicit-dimensions.json
diff --git a/adapters/valueimpression/valueimpressiontest/supplemental/invalid-response-no-bids.json b/adapters/apacdex/apacdextest/supplemental/invalid-response-no-bids.json
similarity index 100%
rename from adapters/valueimpression/valueimpressiontest/supplemental/invalid-response-no-bids.json
rename to adapters/apacdex/apacdextest/supplemental/invalid-response-no-bids.json
diff --git a/adapters/valueimpression/valueimpressiontest/supplemental/invalid-response-unmarshall-error.json b/adapters/apacdex/apacdextest/supplemental/invalid-response-unmarshall-error.json
similarity index 100%
rename from adapters/valueimpression/valueimpressiontest/supplemental/invalid-response-unmarshall-error.json
rename to adapters/apacdex/apacdextest/supplemental/invalid-response-unmarshall-error.json
diff --git a/adapters/valueimpression/valueimpressiontest/supplemental/no-imps-in-request.json b/adapters/apacdex/apacdextest/supplemental/no-imps-in-request.json
similarity index 100%
rename from adapters/valueimpression/valueimpressiontest/supplemental/no-imps-in-request.json
rename to adapters/apacdex/apacdextest/supplemental/no-imps-in-request.json
diff --git a/adapters/valueimpression/valueimpressiontest/supplemental/server-error-code.json b/adapters/apacdex/apacdextest/supplemental/server-error-code.json
similarity index 91%
rename from adapters/valueimpression/valueimpressiontest/supplemental/server-error-code.json
rename to adapters/apacdex/apacdextest/supplemental/server-error-code.json
index ea31fdc2fe9..b8656aa74a5 100644
--- a/adapters/valueimpression/valueimpressiontest/supplemental/server-error-code.json
+++ b/adapters/apacdex/apacdextest/supplemental/server-error-code.json
@@ -46,7 +46,7 @@
 
     "expectedMakeBidsErrors": [
       {
-        "value": "Bad server response: HTTP status 500",
+        "value": "Unexpected status code: 500. Run with request.debug = 1 for more info.",
         "comparison": "literal"
       }
     ]
diff --git a/adapters/valueimpression/valueimpressiontest/supplemental/server-no-content.json b/adapters/apacdex/apacdextest/supplemental/server-no-content.json
similarity index 100%
rename from adapters/valueimpression/valueimpressiontest/supplemental/server-no-content.json
rename to adapters/apacdex/apacdextest/supplemental/server-no-content.json
diff --git a/adapters/valueimpression/valueimpressiontest/supplemental/wrong-impression-mapping.json b/adapters/apacdex/apacdextest/supplemental/wrong-bid-ext.json
similarity index 85%
rename from adapters/valueimpression/valueimpressiontest/supplemental/wrong-impression-mapping.json
rename to adapters/apacdex/apacdextest/supplemental/wrong-bid-ext.json
index ef4d3a7526b..f2842d88d2f 100644
--- a/adapters/valueimpression/valueimpressiontest/supplemental/wrong-impression-mapping.json
+++ b/adapters/apacdex/apacdextest/supplemental/wrong-bid-ext.json
@@ -20,7 +20,6 @@
       }
     ]
   },
-
   "httpCalls": [
     {
       "expectedRequest": {
@@ -29,7 +28,7 @@
           "id": "test-request-id",
           "imp": [
             {
-              "id":"test-imp-id",
+              "id": "test-imp-id",
               "video": {
                 "w": 900,
                 "h": 250,
@@ -54,10 +53,11 @@
               "bid": [
                 {
                   "id": "test-bid-id",
-                  "impid": "BOGUS-IMPID",
+                  "impid": "another-imp-id",
                   "price": 3.5,
                   "w": 900,
-                  "h": 250
+                  "h": 250,
+                  "ext": {}
                 }
               ]
             }
@@ -68,8 +68,8 @@
   ],
   "expectedMakeBidsErrors": [
     {
-      "value": "bid id='test-bid-id' could not find valid impid='BOGUS-IMPID'",
+      "value": "Failed to parse bid mediatype for impression \"another-imp-id\"",
       "comparison": "regex"
     }
-]
+  ]
 }
\ No newline at end of file
diff --git a/adapters/valueimpression/valueimpressiontest/supplemental/wrong-impression-ext.json b/adapters/apacdex/apacdextest/supplemental/wrong-impression-ext.json
similarity index 89%
rename from adapters/valueimpression/valueimpressiontest/supplemental/wrong-impression-ext.json
rename to adapters/apacdex/apacdextest/supplemental/wrong-impression-ext.json
index 13514ac8ab8..09efa59563d 100644
--- a/adapters/valueimpression/valueimpressiontest/supplemental/wrong-impression-ext.json
+++ b/adapters/apacdex/apacdextest/supplemental/wrong-impression-ext.json
@@ -19,7 +19,7 @@
 
   "expectedMakeRequestsErrors": [
     {
-      "value": "json: cannot unmarshal number into Go struct field ExtImpValueImpression.siteId of type string",
+      "value": "json: cannot unmarshal number into Go struct field ExtImpApacdex.siteId of type string",
       "comparison": "literal"
     }
   ]
diff --git a/adapters/valueimpression/params_test.go b/adapters/apacdex/params_test.go
similarity index 53%
rename from adapters/valueimpression/params_test.go
rename to adapters/apacdex/params_test.go
index 46471de24bb..2e5f626e16d 100644
--- a/adapters/valueimpression/params_test.go
+++ b/adapters/apacdex/params_test.go
@@ -1,4 +1,4 @@
-package valueimpression
+package apacdex
 
 import (
 	"encoding/json"
@@ -7,9 +7,9 @@ import (
 	"github.com/prebid/prebid-server/openrtb_ext"
 )
 
-// This file actually intends to test static/bidder-params/valueimpression.json
-// These also validate the format of the external API: request.imp[i].ext.valueimpression
-// TestValidParams makes sure that the ValueImpression schema accepts all imp.ext fields which we intend to support.
+// This file actually intends to test static/bidder-params/apacdex.json
+// These also validate the format of the external API: request.imp[i].ext.apacdex
+// TestValidParams makes sure that the Apacdex schema accepts all imp.ext fields which we intend to support.
 
 func TestValidParams(t *testing.T) {
 	validator, err := openrtb_ext.NewBidderParamsValidator("../../static/bidder-params")
@@ -18,13 +18,13 @@ func TestValidParams(t *testing.T) {
 	}
 
 	for _, validParam := range validParams {
-		if err := validator.Validate(openrtb_ext.BidderValueImpression, json.RawMessage(validParam)); err != nil {
-			t.Errorf("Schema rejected ValueImpression params: %s", validParam)
+		if err := validator.Validate(openrtb_ext.BidderApacdex, json.RawMessage(validParam)); err != nil {
+			t.Errorf("Schema rejected Apacdex params: %s", validParam)
 		}
 	}
 }
 
-// TestInvalidParams makes sure that the ValueImpression schema rejects all the imp.ext fields we don't support.
+// TestInvalidParams makes sure that the Apacdex schema rejects all the imp.ext fields we don't support.
 func TestInvalidParams(t *testing.T) {
 	validator, err := openrtb_ext.NewBidderParamsValidator("../../static/bidder-params")
 	if err != nil {
@@ -32,7 +32,7 @@ func TestInvalidParams(t *testing.T) {
 	}
 
 	for _, invalidParam := range invalidParams {
-		if err := validator.Validate(openrtb_ext.BidderValueImpression, json.RawMessage(invalidParam)); err == nil {
+		if err := validator.Validate(openrtb_ext.BidderApacdex, json.RawMessage(invalidParam)); err == nil {
 			t.Errorf("Schema allowed unexpected params: %s", invalidParam)
 		}
 	}
@@ -40,6 +40,9 @@ func TestInvalidParams(t *testing.T) {
 
 var validParams = []string{
 	`{"siteId": "123"}`,
+	`{"siteId": "123", "floorPrice": 0.05}`,
+	`{"placementId": "123123"}`,
+	`{"placementId": "123123", "floorPrice": 0.05}`,
 }
 
 var invalidParams = []string{
@@ -47,6 +50,7 @@ var invalidParams = []string{
 	`null`,
 	`true`,
 	`154`,
-	`{"siteId": 123}`, // siteId should be string
+	`{"siteId": 123}`,
 	`{"invalid_param": "123"}`,
+	`{"siteId": "123", "placementId": "123123"}`,
 }
diff --git a/adapters/compass/compass.go b/adapters/compass/compass.go
new file mode 100644
index 00000000000..eed846576bb
--- /dev/null
+++ b/adapters/compass/compass.go
@@ -0,0 +1,154 @@
+package compass
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+
+	"github.com/mxmCherry/openrtb/v15/openrtb2"
+	"github.com/prebid/prebid-server/adapters"
+	"github.com/prebid/prebid-server/config"
+	"github.com/prebid/prebid-server/errortypes"
+	"github.com/prebid/prebid-server/openrtb_ext"
+)
+
+type adapter struct {
+	endpoint string
+}
+
+type reqBodyExt struct {
+	CompassBidderExt reqBodyExtBidder `json:"bidder"`
+}
+
+type reqBodyExtBidder struct {
+	Type        string `json:"type"`
+	PlacementID string `json:"placementId,omitempty"`
+	EndpointID  string `json:"endpointId,omitempty"`
+}
+
+func Builder(bidderName openrtb_ext.BidderName, config config.Adapter) (adapters.Bidder, error) {
+	bidder := &adapter{
+		endpoint: config.Endpoint,
+	}
+	return bidder, nil
+}
+
+func (a *adapter) MakeRequests(request *openrtb2.BidRequest, reqInfo *adapters.ExtraRequestInfo) ([]*adapters.RequestData, []error) {
+	var err error
+	var adapterRequests []*adapters.RequestData
+
+	reqCopy := *request
+	for _, imp := range request.Imp {
+		reqCopy.Imp = []openrtb2.Imp{imp}
+
+		var bidderExt adapters.ExtImpBidder
+		var compassExt openrtb_ext.ImpExtCompass
+
+		if err = json.Unmarshal(reqCopy.Imp[0].Ext, &bidderExt); err != nil {
+			return nil, []error{err}
+		}
+		if err = json.Unmarshal(bidderExt.Bidder, &compassExt); err != nil {
+			return nil, []error{err}
+		}
+
+		temp := reqBodyExt{CompassBidderExt: reqBodyExtBidder{}}
+
+		if compassExt.PlacementID != "" {
+			temp.CompassBidderExt.PlacementID = compassExt.PlacementID
+			temp.CompassBidderExt.Type = "publisher"
+		} else if compassExt.EndpointID != "" {
+			temp.CompassBidderExt.EndpointID = compassExt.EndpointID
+			temp.CompassBidderExt.Type = "network"
+		}
+
+		finalyImpExt, err := json.Marshal(temp)
+		if err != nil {
+			return nil, []error{err}
+		}
+
+		reqCopy.Imp[0].Ext = finalyImpExt
+
+		adapterReq, err := a.makeRequest(&reqCopy)
+		if err != nil {
+			return nil, []error{err}
+		}
+
+		if adapterReq != nil {
+			adapterRequests = append(adapterRequests, adapterReq)
+		}
+	}
+	return adapterRequests, nil
+}
+
+func (a *adapter) makeRequest(request *openrtb2.BidRequest) (*adapters.RequestData, error) {
+	reqJSON, err := json.Marshal(request)
+	if err != nil {
+		return nil, err
+	}
+
+	headers := http.Header{}
+	headers.Add("Content-Type", "application/json;charset=utf-8")
+	headers.Add("Accept", "application/json")
+	return &adapters.RequestData{
+		Method:  "POST",
+		Uri:     a.endpoint,
+		Body:    reqJSON,
+		Headers: headers,
+	}, err
+}
+
+func (a *adapter) MakeBids(request *openrtb2.BidRequest, requestData *adapters.RequestData, responseData *adapters.ResponseData) (*adapters.BidderResponse, []error) {
+	if responseData.StatusCode == http.StatusNoContent {
+		return nil, nil
+	}
+
+	if responseData.StatusCode != http.StatusOK {
+		err := &errortypes.BadServerResponse{
+			Message: fmt.Sprintf("Unexpected status code: %d. Run with request.debug = 1 for more info.", responseData.StatusCode),
+		}
+		return nil, []error{err}
+	}
+
+	var response openrtb2.BidResponse
+	if err := json.Unmarshal(responseData.Body, &response); err != nil {
+		return nil, []error{err}
+	}
+
+	bidResponse := adapters.NewBidderResponseWithBidsCapacity(len(request.Imp))
+	bidResponse.Currency = response.Cur
+	for _, seatBid := range response.SeatBid {
+		for i := range seatBid.Bid {
+			bidType, err := getMediaTypeForImp(seatBid.Bid[i].ImpID, request.Imp)
+			if err != nil {
+				return nil, []error{err}
+			}
+
+			b := &adapters.TypedBid{
+				Bid:     &seatBid.Bid[i],
+				BidType: bidType,
+			}
+			bidResponse.Bids = append(bidResponse.Bids, b)
+		}
+	}
+	return bidResponse, nil
+}
+
+func getMediaTypeForImp(impID string, imps []openrtb2.Imp) (openrtb_ext.BidType, error) {
+	for _, imp := range imps {
+		if imp.ID == impID {
+			if imp.Banner != nil {
+				return openrtb_ext.BidTypeBanner, nil
+			}
+			if imp.Video != nil {
+				return openrtb_ext.BidTypeVideo, nil
+			}
+			if imp.Native != nil {
+				return openrtb_ext.BidTypeNative, nil
+			}
+		}
+	}
+
+	return "", &errortypes.BadInput{
+		Message: fmt.Sprintf("Failed to find impression \"%s\"", impID),
+	}
+}
diff --git a/adapters/compass/compass_test.go b/adapters/compass/compass_test.go
new file mode 100644
index 00000000000..fce791e5997
--- /dev/null
+++ b/adapters/compass/compass_test.go
@@ -0,0 +1,20 @@
+package compass
+
+import (
+	"testing"
+
+	"github.com/prebid/prebid-server/adapters/adapterstest"
+	"github.com/prebid/prebid-server/config"
+	"github.com/prebid/prebid-server/openrtb_ext"
+)
+
+func TestJsonSamples(t *testing.T) {
+	bidder, buildErr := Builder(openrtb_ext.BidderCompass, config.Adapter{
+		Endpoint: "http://sa-lb.deliverimp.com/pserver"})
+
+	if buildErr != nil {
+		t.Fatalf("Builder returned unexpected error %v", buildErr)
+	}
+
+	adapterstest.RunJSONBidderTest(t, "compasstest", bidder)
+}
diff --git a/adapters/compass/compasstest/exemplary/endpointId.json b/adapters/compass/compasstest/exemplary/endpointId.json
new file mode 100644
index 00000000000..f02481b32a3
--- /dev/null
+++ b/adapters/compass/compasstest/exemplary/endpointId.json
@@ -0,0 +1,133 @@
+{
+    "mockBidRequest": {
+        "id": "test-request-id",
+        "device": {
+            "ip": "123.123.123.123",
+            "ua": "iPad"
+        },
+        "app": {
+            "id": "1",
+            "bundle": "com.wls.testwlsapplication"
+        },
+        "imp": [
+            {
+                "id": "test-imp-id",
+                "tagid": "test",
+                "banner": {
+                    "format": [
+                        {
+                            "w": 300,
+                            "h": 250
+                        },
+                        {
+                            "w": 300,
+                            "h": 600
+                        }
+                    ]
+                },
+                "ext": {
+                    "bidder": {
+                        "endpointId": "test"
+                    }
+                }
+            }
+        ]
+    },
+    "httpCalls": [
+        {
+            "expectedRequest": {
+                "uri": "http://sa-lb.deliverimp.com/pserver",
+                "body": {
+                    "id": "test-request-id",
+                    "imp": [
+                        {
+                            "id": "test-imp-id",
+                            "tagid": "test",
+                            "banner": {
+                                "format": [
+                                    {
+                                        "w": 300,
+                                        "h": 250
+                                    },
+                                    {
+                                        "w": 300,
+                                        "h": 600
+                                    }
+                                ]
+                            },
+                            "ext": {
+                                "bidder": {
+                                    "endpointId": "test",
+                                    "type": "network"
+                                }
+                            }
+                        }
+                    ],
+                    "app": {
+                        "id": "1",
+                        "bundle": "com.wls.testwlsapplication"
+                    },
+                    "device": {
+                        "ip": "123.123.123.123",
+                        "ua": "iPad"
+                    }
+                }
+            },
+            "mockResponse": {
+                "status": 200,
+                "body": {
+                    "id": "test-request-id",
+                    "seatbid": [
+                        {
+                            "bid": [
+                                {
+                                    "id": "test_bid_id",
+                                    "impid": "test-imp-id",
+                                    "price": 0.27543,
+                                    "adm": "<iframe id=\"adm-banner-16\" width=\"300\" height=\"250\" frameborder=\"0\" marginheight=\"0\" marginwidth=\"0\" style=\"{overflow:hidden}\" src=\"http://sa-lb.deliverimp.com/pserver&k=882b2510ed6d6c94fa69c99aa522a708\"></iframe>",
+                                    "cid": "test_cid",
+                                    "crid": "test_crid",
+                                    "dealid": "test_dealid",
+                                    "w": 300,
+                                    "h": 250,
+                                    "ext": {
+                                        "prebid": {
+                                            "type": "banner"
+                                        }
+                                    }
+                                }
+                            ],
+                            "seat": "compass"
+                        }
+                    ],
+                    "cur": "USD"
+                }
+            }
+        }
+    ],
+    "expectedBidResponses": [
+        {
+            "bids": [
+                {
+                    "bid": {
+                        "id": "test_bid_id",
+                        "impid": "test-imp-id",
+                        "price": 0.27543,
+                        "adm": "<iframe id=\"adm-banner-16\" width=\"300\" height=\"250\" frameborder=\"0\" marginheight=\"0\" marginwidth=\"0\" style=\"{overflow:hidden}\" src=\"http://sa-lb.deliverimp.com/pserver&k=882b2510ed6d6c94fa69c99aa522a708\"></iframe>",
+                        "cid": "test_cid",
+                        "crid": "test_crid",
+                        "dealid": "test_dealid",
+                        "w": 300,
+                        "h": 250,
+                        "ext": {
+                            "prebid": {
+                                "type": "banner"
+                            }
+                        }
+                    },
+                    "type": "banner"
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/adapters/compass/compasstest/exemplary/simple-banner.json b/adapters/compass/compasstest/exemplary/simple-banner.json
new file mode 100644
index 00000000000..592570cda6b
--- /dev/null
+++ b/adapters/compass/compasstest/exemplary/simple-banner.json
@@ -0,0 +1,133 @@
+{
+    "mockBidRequest": {
+        "id": "test-request-id",
+        "device": {
+            "ip": "123.123.123.123",
+            "ua": "iPad"
+        },
+        "app": {
+            "id": "1",
+            "bundle": "com.wls.testwlsapplication"
+        },
+        "imp": [
+            {
+                "id": "test-imp-id",
+                "tagid": "test",
+                "banner": {
+                    "format": [
+                        {
+                            "w": 300,
+                            "h": 250
+                        },
+                        {
+                            "w": 300,
+                            "h": 600
+                        }
+                    ]
+                },
+                "ext": {
+                    "bidder": {
+                        "placementId": "test"
+                    }
+                }
+            }
+        ]
+    },
+    "httpCalls": [
+        {
+            "expectedRequest": {
+                "uri": "http://sa-lb.deliverimp.com/pserver",
+                "body": {
+                    "id": "test-request-id",
+                    "imp": [
+                        {
+                            "id": "test-imp-id",
+                            "tagid": "test",
+                            "banner": {
+                                "format": [
+                                    {
+                                        "w": 300,
+                                        "h": 250
+                                    },
+                                    {
+                                        "w": 300,
+                                        "h": 600
+                                    }
+                                ]
+                            },
+                            "ext": {
+                                "bidder": {
+                                    "placementId": "test",
+                                    "type": "publisher"
+                                }
+                            }
+                        }
+                    ],
+                    "app": {
+                        "id": "1",
+                        "bundle": "com.wls.testwlsapplication"
+                    },
+                    "device": {
+                        "ip": "123.123.123.123",
+                        "ua": "iPad"
+                    }
+                }
+            },
+            "mockResponse": {
+                "status": 200,
+                "body": {
+                    "id": "test-request-id",
+                    "seatbid": [
+                        {
+                            "bid": [
+                                {
+                                    "id": "test_bid_id",
+                                    "impid": "test-imp-id",
+                                    "price": 0.27543,
+                                    "adm": "<iframe id=\"adm-banner-16\" width=\"300\" height=\"250\" frameborder=\"0\" marginheight=\"0\" marginwidth=\"0\" style=\"{overflow:hidden}\" src=\"http://sa-lb.deliverimp.com/pserver&k=882b2510ed6d6c94fa69c99aa522a708\"></iframe>",
+                                    "cid": "test_cid",
+                                    "crid": "test_crid",
+                                    "dealid": "test_dealid",
+                                    "w": 300,
+                                    "h": 250,
+                                    "ext": {
+                                        "prebid": {
+                                            "type": "banner"
+                                        }
+                                    }
+                                }
+                            ],
+                            "seat": "compass"
+                        }
+                    ],
+                    "cur": "USD"
+                }
+            }
+        }
+    ],
+    "expectedBidResponses": [
+        {
+            "bids": [
+                {
+                    "bid": {
+                        "id": "test_bid_id",
+                        "impid": "test-imp-id",
+                        "price": 0.27543,
+                        "adm": "<iframe id=\"adm-banner-16\" width=\"300\" height=\"250\" frameborder=\"0\" marginheight=\"0\" marginwidth=\"0\" style=\"{overflow:hidden}\" src=\"http://sa-lb.deliverimp.com/pserver&k=882b2510ed6d6c94fa69c99aa522a708\"></iframe>",
+                        "cid": "test_cid",
+                        "crid": "test_crid",
+                        "dealid": "test_dealid",
+                        "w": 300,
+                        "h": 250,
+                        "ext": {
+                            "prebid": {
+                                "type": "banner"
+                            }
+                        }
+                    },
+                    "type": "banner"
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/adapters/compass/compasstest/exemplary/simple-native.json b/adapters/compass/compasstest/exemplary/simple-native.json
new file mode 100644
index 00000000000..0ec8b43ce9c
--- /dev/null
+++ b/adapters/compass/compasstest/exemplary/simple-native.json
@@ -0,0 +1,117 @@
+{
+    "mockBidRequest": {
+        "id": "test-request-id",
+        "device": {
+            "ip": "123.123.123.123",
+            "ua": "iPad"
+        },
+        "app": {
+            "id": "1",
+            "bundle": "com.wls.testwlsapplication"
+        },
+        "imp": [
+            {
+                "id": "test-imp-id",
+                "tagid": "test",
+                "native": {
+                    "request": "{\"ver\":\"1.1\",\"layout\":1,\"adunit\":2,\"plcmtcnt\":6,\"plcmttype\":4,\"assets\":[{\"id\":1,\"required\":1,\"title\":{\"len\":75}},{\"id\":2,\"required\":1,\"img\":{\"wmin\":492,\"hmin\":328,\"type\":3,\"mimes\":[\"image/jpeg\",\"image/jpg\",\"image/png\"]}},{\"id\":4,\"required\":0,\"data\":{\"type\":6}},{\"id\":5,\"required\":0,\"data\":{\"type\":7}},{\"id\":6,\"required\":0,\"data\":{\"type\":1,\"len\":20}}]}",
+                    "ver": "1.1"
+                },
+                "ext": {
+                    "bidder": {
+                        "placementId": "test"
+                    }
+                }
+            }
+        ]
+    },
+    "httpCalls": [
+        {
+            "expectedRequest": {
+                "uri": "http://sa-lb.deliverimp.com/pserver",
+                "body": {
+                    "id": "test-request-id",
+                    "imp": [
+                        {
+                            "id": "test-imp-id",
+                            "tagid": "test",
+                            "native": {
+                                "request": "{\"ver\":\"1.1\",\"layout\":1,\"adunit\":2,\"plcmtcnt\":6,\"plcmttype\":4,\"assets\":[{\"id\":1,\"required\":1,\"title\":{\"len\":75}},{\"id\":2,\"required\":1,\"img\":{\"wmin\":492,\"hmin\":328,\"type\":3,\"mimes\":[\"image/jpeg\",\"image/jpg\",\"image/png\"]}},{\"id\":4,\"required\":0,\"data\":{\"type\":6}},{\"id\":5,\"required\":0,\"data\":{\"type\":7}},{\"id\":6,\"required\":0,\"data\":{\"type\":1,\"len\":20}}]}",
+                                "ver": "1.1"
+                            },
+                            "ext": {
+                                "bidder": {
+                                    "placementId": "test",
+                                    "type": "publisher"
+                                }
+                            }
+                        }
+                    ],
+                    "app": {
+                        "id": "1",
+                        "bundle": "com.wls.testwlsapplication"
+                    },
+                    "device": {
+                        "ip": "123.123.123.123",
+                        "ua": "iPad"
+                    }
+                }
+            },
+            "mockResponse": {
+                "status": 200,
+                "body": {
+                    "id": "test-request-id",
+                    "seatbid": [
+                        {
+                            "bid": [
+                                {
+                                    "id": "test_bid_id",
+                                    "impid": "test-imp-id",
+                                    "price": 0.27543,
+                                    "adm": "<iframe id=\"adm-banner-16\" width=\"300\" height=\"250\" frameborder=\"0\" marginheight=\"0\" marginwidth=\"0\" style=\"{overflow:hidden}\" src=\"http://sa-lb.deliverimp.com/pserver&k=882b2510ed6d6c94fa69c99aa522a708\"></iframe>",
+                                    "cid": "test_cid",
+                                    "crid": "test_crid",
+                                    "dealid": "test_dealid",
+                                    "w": 300,
+                                    "h": 250,
+                                    "ext": {
+                                        "prebid": {
+                                            "type": "native"
+                                        }
+                                    }
+                                }
+                            ],
+                            "seat": "compass"
+                        }
+                    ],
+                    "cur": "USD"
+                }
+            }
+        }
+    ],
+    "expectedBidResponses": [
+        {
+            "bids": [
+                {
+                    "bid": {
+                        "id": "test_bid_id",
+                        "impid": "test-imp-id",
+                        "price": 0.27543,
+                        "adm": "<iframe id=\"adm-banner-16\" width=\"300\" height=\"250\" frameborder=\"0\" marginheight=\"0\" marginwidth=\"0\" style=\"{overflow:hidden}\" src=\"http://sa-lb.deliverimp.com/pserver&k=882b2510ed6d6c94fa69c99aa522a708\"></iframe>",
+                        "cid": "test_cid",
+                        "crid": "test_crid",
+                        "dealid": "test_dealid",
+                        "w": 300,
+                        "h": 250,
+                        "ext": {
+                            "prebid": {
+                                "type": "native"
+                            }
+                        }
+                    },
+                    "type": "native"
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/adapters/compass/compasstest/exemplary/simple-video.json b/adapters/compass/compasstest/exemplary/simple-video.json
new file mode 100644
index 00000000000..0f279496f36
--- /dev/null
+++ b/adapters/compass/compasstest/exemplary/simple-video.json
@@ -0,0 +1,128 @@
+{
+    "mockBidRequest": {
+        "id": "test-request-id",
+        "device": {
+            "ip": "123.123.123.123",
+            "ua": "iPad"
+        },
+        "app": {
+            "id": "1",
+            "bundle": "com.wls.testwlsapplication"
+        },
+        "imp": [
+            {
+                "id": "test-imp-id",
+                "tagid": "test",
+                "video": {
+                    "mimes": [
+                        "video/mp4"
+                    ],
+                    "protocols": [
+                        2,
+                        5
+                    ],
+                    "w": 1024,
+                    "h": 576
+                },
+                "ext": {
+                    "bidder": {
+                        "placementId": "test"
+                    }
+                }
+            }
+        ]
+    },
+    "httpCalls": [
+        {
+            "expectedRequest": {
+                "uri": "http://sa-lb.deliverimp.com/pserver",
+                "body": {
+                    "id": "test-request-id",
+                    "device": {
+                        "ip": "123.123.123.123",
+                        "ua": "iPad"
+                    },
+                    "app": {
+                        "id": "1",
+                        "bundle": "com.wls.testwlsapplication"
+                    },
+                    "imp": [
+                        {
+                            "id": "test-imp-id",
+                            "tagid": "test",
+                            "video": {
+                                "mimes": [
+                                    "video/mp4"
+                                ],
+                                "protocols": [
+                                    2,
+                                    5
+                                ],
+                                "w": 1024,
+                                "h": 576
+                            },
+                            "ext": {
+                                "bidder": {
+                                    "placementId": "test",
+                                    "type": "publisher"
+                                }
+                            }
+                        }
+                    ]
+                }
+            },
+            "mockResponse": {
+                "status": 200,
+                "body": {
+                    "id": "test-request-id",
+                    "seatbid": [
+                        {
+                            "bid": [
+                                {
+                                    "id": "test_bid_id",
+                                    "impid": "test-imp-id",
+                                    "price": 0.27543,
+                                    "adm": "<VAST version=\"3.0\"><Ad id=\"20001\" sequence=\"1\"><InLine><AdSystem version=\"4.0\"><![CDATA[iabtechlab]]></AdSystem><AdTitle><![CDATA[Inline Simple Ad]]></AdTitle><Impression><![CDATA[]]></Impression><Creatives><Creative id=\"5480\" sequence=\"1\"><Linear><Duration>00:01:00</Duration><MediaFiles><MediaFile id=\"5246\" delivery=\"progressive\" type=\"video/mp4\" bitrate=\"600\" width=\"640\" height=\"360\" minBitrate=\"500\" maxBitrate=\"700\" scalable=\"1\" maintainAspectRatio=\"1\" codec=\"0\"><![CDATA[https://s0.2mdn.net/4253510/google_ddm_animation_480P.mp4]]></MediaFile></MediaFiles><VideoClicks><ClickThrough id=\"blog\"><![CDATA[https://example.com]]></ClickThrough></VideoClicks></Linear></Creative></Creatives></InLine></Ad></VAST>",
+                                    "cid": "test_cid",
+                                    "crid": "test_crid",
+                                    "dealid": "test_dealid",
+                                    "ext": {
+                                        "prebid": {
+                                            "type": "video"
+                                        }
+                                    }
+                                }
+                            ],
+                            "seat": "compass"
+                        }
+                    ],
+                    "cur": "USD"
+                }
+            }
+        }
+    ],
+    "expectedBidResponses": [
+        {
+            "currency": "USD",
+            "bids": [
+                {
+                    "bid": {
+                        "id": "test_bid_id",
+                        "impid": "test-imp-id",
+                        "price": 0.27543,
+                        "adm": "<VAST version=\"3.0\"><Ad id=\"20001\" sequence=\"1\"><InLine><AdSystem version=\"4.0\"><![CDATA[iabtechlab]]></AdSystem><AdTitle><![CDATA[Inline Simple Ad]]></AdTitle><Impression><![CDATA[]]></Impression><Creatives><Creative id=\"5480\" sequence=\"1\"><Linear><Duration>00:01:00</Duration><MediaFiles><MediaFile id=\"5246\" delivery=\"progressive\" type=\"video/mp4\" bitrate=\"600\" width=\"640\" height=\"360\" minBitrate=\"500\" maxBitrate=\"700\" scalable=\"1\" maintainAspectRatio=\"1\" codec=\"0\"><![CDATA[https://s0.2mdn.net/4253510/google_ddm_animation_480P.mp4]]></MediaFile></MediaFiles><VideoClicks><ClickThrough id=\"blog\"><![CDATA[https://example.com]]></ClickThrough></VideoClicks></Linear></Creative></Creatives></InLine></Ad></VAST>",
+                        "cid": "test_cid",
+                        "crid": "test_crid",
+                        "dealid": "test_dealid",
+                        "ext": {
+                            "prebid": {
+                                "type": "video"
+                            }
+                        }
+                    },
+                    "type": "video"
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/adapters/compass/compasstest/exemplary/simple-web-banner.json b/adapters/compass/compasstest/exemplary/simple-web-banner.json
new file mode 100644
index 00000000000..1896101ac68
--- /dev/null
+++ b/adapters/compass/compasstest/exemplary/simple-web-banner.json
@@ -0,0 +1,133 @@
+{
+    "mockBidRequest": {
+        "id": "test-request-id",
+        "imp": [
+            {
+                "id": "test-imp-id",
+                "tagid": "test",
+                "banner": {
+                    "format": [
+                        {
+                            "w": 300,
+                            "h": 250
+                        },
+                        {
+                            "w": 300,
+                            "h": 600
+                        }
+                    ]
+                },
+                "ext": {
+                    "bidder": {
+                        "placementId": "test"
+                    }
+                }
+            }
+        ],
+        "site": {
+            "id": "1",
+            "domain": "test.com"
+        },
+        "device": {
+            "ip": "123.123.123.123",
+            "ua": "Ubuntu"
+        }
+    },
+    "httpCalls": [
+        {
+            "expectedRequest": {
+                "uri": "http://sa-lb.deliverimp.com/pserver",
+                "body": {
+                    "id": "test-request-id",
+                    "imp": [
+                        {
+                            "id": "test-imp-id",
+                            "tagid": "test",
+                            "banner": {
+                                "format": [
+                                    {
+                                        "w": 300,
+                                        "h": 250
+                                    },
+                                    {
+                                        "w": 300,
+                                        "h": 600
+                                    }
+                                ]
+                            },
+                            "ext": {
+                                "bidder": {
+                                    "placementId": "test",
+                                    "type": "publisher"
+                                }
+                            }
+                        }
+                    ],
+                    "site": {
+                        "id": "1",
+                        "domain": "test.com"
+                    },
+                    "device": {
+                        "ip": "123.123.123.123",
+                        "ua": "Ubuntu"
+                    }
+                }
+            },
+            "mockResponse": {
+                "status": 200,
+                "body": {
+                    "id": "test-request-id",
+                    "seatbid": [
+                        {
+                            "bid": [
+                                {
+                                    "id": "test_bid_id",
+                                    "impid": "test-imp-id",
+                                    "price": 0.27543,
+                                    "adm": "<iframe id=\"adm-banner-1\" width=\"468\" height=\"60\" frameborder=\"0\" marginheight=\"0\" marginwidth=\"0\" style=\"{overflow:hidden}\" src=\"http://sa-lb.deliverimp.com/pserver&k=bc2d316f39931a07d9a8dd249bf85fc0\"></iframe>",
+                                    "cid": "test_cid",
+                                    "crid": "test_crid",
+                                    "dealid": "test_dealid",
+                                    "w": 468,
+                                    "h": 60,
+                                    "ext": {
+                                        "prebid": {
+                                            "type": "banner"
+                                        }
+                                    }
+                                }
+                            ],
+                            "seat": "compass"
+                        }
+                    ],
+                    "cur": "USD"
+                }
+            }
+        }
+    ],
+    "expectedBidResponses": [
+        {
+            "bids": [
+                {
+                    "bid": {
+                        "id": "test_bid_id",
+                        "impid": "test-imp-id",
+                        "price": 0.27543,
+                        "adm": "<iframe id=\"adm-banner-1\" width=\"468\" height=\"60\" frameborder=\"0\" marginheight=\"0\" marginwidth=\"0\" style=\"{overflow:hidden}\" src=\"http://sa-lb.deliverimp.com/pserver&k=bc2d316f39931a07d9a8dd249bf85fc0\"></iframe>",
+                        "cid": "test_cid",
+                        "crid": "test_crid",
+                        "dealid": "test_dealid",
+                        "w": 468,
+                        "h": 60,
+                        "ext": {
+                            "prebid": {
+                                "type": "banner"
+                            }
+                        }
+                    },
+                    "type": "banner"
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/adapters/compass/compasstest/supplemental/bad_media_type.json b/adapters/compass/compasstest/supplemental/bad_media_type.json
new file mode 100644
index 00000000000..0bfaec4f23d
--- /dev/null
+++ b/adapters/compass/compasstest/supplemental/bad_media_type.json
@@ -0,0 +1,86 @@
+{
+	"mockBidRequest": {
+        "id": "test-request-id",
+        "imp": [
+            {
+                "id": "test-imp-id",
+                "ext": {
+                    "bidder": {
+                        "placementId": "test"
+                    }
+                }
+            }
+        ],
+        "app": {
+            "id": "1",
+            "bundle": "com.wls.testwlsapplication"
+        },
+        "device": {
+            "ip": "123.123.123.123",
+            "ifa": "sdjfksdf-dfsds-dsdg-dsgg"
+        }
+    },
+	"httpCalls": [{
+		"expectedRequest": {
+			"uri": "http://sa-lb.deliverimp.com/pserver",
+			"body": {
+                "id": "test-request-id",
+                "imp": [
+                    {
+                        "id": "test-imp-id",
+                        "ext": {
+                            "bidder": {
+                                "placementId": "test",
+                                "type": "publisher"
+                            }
+                        }
+                    }
+                ],
+                "app": {
+                    "id": "1",
+                    "bundle": "com.wls.testwlsapplication"
+                },
+                "device": {
+                    "ip": "123.123.123.123",
+                    "ifa": "sdjfksdf-dfsds-dsdg-dsgg"
+                }
+            }
+		},
+		"mockResponse": {
+			"status": 200,
+			"body": {
+                "id": "test-request-id",
+                "seatbid": [
+                    {
+                        "bid": [
+                            {
+                                "id": "test_bid_id",
+                                "impid": "test-imp-id",
+                                "price": 0.27543,
+                                "adm": "<iframe id=\"adm-banner-16\" width=\"300\" height=\"250\" frameborder=\"0\" marginheight=\"0\" marginwidth=\"0\" style=\"{overflow:hidden}\" src=\"http://sa-lb.deliverimp.com/pserver&k=882b2510ed6d6c94fa69c99aa522a708\"></iframe>",
+                                "cid": "test_cid",
+                                "crid": "test_crid",
+                                "dealid": "test_dealid",
+                                "w": 300,
+                                "h": 250,
+                                "ext": {
+                                    "prebid": {
+                                        "type": "banner"
+                                    }
+                                }
+                            }
+                        ],
+                        "seat": "compass"
+                    }
+                ],
+                "cur": "USD"
+            }
+        }
+    }],
+    "expectedMakeBidsErrors": [
+        {
+          "value": "Failed to find impression \"test-imp-id\"",
+          "comparison": "literal"
+        }
+    ]
+}
diff --git a/adapters/compass/compasstest/supplemental/bad_response.json b/adapters/compass/compasstest/supplemental/bad_response.json
new file mode 100644
index 00000000000..3c660338c63
--- /dev/null
+++ b/adapters/compass/compasstest/supplemental/bad_response.json
@@ -0,0 +1,84 @@
+{
+	"mockBidRequest": {
+        "id": "test-request-id",
+        "imp": [
+            {
+                "id": "test-imp-id",
+                "banner": {
+                    "format": [
+                        {
+                            "w": 300,
+                            "h": 250
+                        },
+                        {
+                            "w": 300,
+                            "h": 600
+                        }
+                    ]
+                },
+                "ext": {
+                    "bidder": {
+                        "placementId": "test"
+                    }
+                }
+            }
+        ],
+        "app": {
+            "id": "1",
+            "bundle": "com.wls.testwlsapplication"
+        },
+        "device": {
+            "ip": "123.123.123.123",
+            "ifa": "sdjfksdf-dfsds-dsdg-dsgg"
+        }
+    },
+	"httpCalls": [{
+		"expectedRequest": {
+			"uri": "http://sa-lb.deliverimp.com/pserver",
+			"body": {
+                "id": "test-request-id",
+                "imp": [
+                    {
+                        "id": "test-imp-id",
+                        "banner": {
+                            "format": [
+                                {
+                                    "w": 300,
+                                    "h": 250
+                                },
+                                {
+                                    "w": 300,
+                                    "h": 600
+                                }
+                            ]
+                        },
+                        "ext": {
+                            "bidder": {
+                                "placementId": "test",
+                                "type": "publisher"
+                            }
+                        }
+                    }
+                ],
+                "app": {
+                    "id": "1",
+                    "bundle": "com.wls.testwlsapplication"
+                },
+                "device": {
+                    "ip": "123.123.123.123",
+                    "ifa": "sdjfksdf-dfsds-dsdg-dsgg"
+                }
+            }
+		},
+		"mockResponse": {
+			"status": 200,
+			"body": ""
+        }
+    }],
+    "expectedMakeBidsErrors": [
+        {
+          "value": "json: cannot unmarshal string into Go value of type openrtb2.BidResponse",
+          "comparison": "literal"
+        }
+    ]
+}
diff --git a/adapters/compass/compasstest/supplemental/status-204.json b/adapters/compass/compasstest/supplemental/status-204.json
new file mode 100644
index 00000000000..1ff5c55abeb
--- /dev/null
+++ b/adapters/compass/compasstest/supplemental/status-204.json
@@ -0,0 +1,79 @@
+{
+	"mockBidRequest": {
+        "id": "test-request-id",
+        "imp": [
+            {
+                "id": "test-imp-id",
+                "banner": {
+                    "format": [
+                        {
+                            "w": 300,
+                            "h": 250
+                        },
+                        {
+                            "w": 300,
+                            "h": 600
+                        }
+                    ]
+                },
+                "ext": {
+                    "bidder": {
+                        "placementId": "test"
+                    }
+                }
+            }
+        ],
+        "app": {
+            "id": "1",
+            "bundle": "com.wls.testwlsapplication"
+        },
+        "device": {
+            "ip": "123.123.123.123",
+            "ifa": "sdjfksdf-dfsds-dsdg-dsgg"
+        }
+    },
+	"httpCalls": [{
+		"expectedRequest": {
+			"uri": "http://sa-lb.deliverimp.com/pserver",
+			"body": {
+                "id": "test-request-id",
+                "imp": [
+                    {
+                        "id": "test-imp-id",
+                        "banner": {
+                            "format": [
+                                {
+                                    "w": 300,
+                                    "h": 250
+                                },
+                                {
+                                    "w": 300,
+                                    "h": 600
+                                }
+                            ]
+                        },
+                        "ext": {
+                            "bidder": {
+                                "placementId": "test",
+                                "type": "publisher"
+                            }
+                        }
+                    }
+                ],
+                "app": {
+                    "id": "1",
+                    "bundle": "com.wls.testwlsapplication"
+                },
+                "device": {
+                    "ip": "123.123.123.123",
+                    "ifa": "sdjfksdf-dfsds-dsdg-dsgg"
+                }
+            }
+		},
+		"mockResponse": {
+			"status": 204,
+			"body": {}
+		}
+    }],
+    "expectedBidResponses": []
+}
diff --git a/adapters/compass/compasstest/supplemental/status-not-200.json b/adapters/compass/compasstest/supplemental/status-not-200.json
new file mode 100644
index 00000000000..51f648de360
--- /dev/null
+++ b/adapters/compass/compasstest/supplemental/status-not-200.json
@@ -0,0 +1,84 @@
+{
+	"mockBidRequest": {
+        "id": "test-request-id",
+        "imp": [
+            {
+                "id": "test-imp-id",
+                "banner": {
+                    "format": [
+                        {
+                            "w": 300,
+                            "h": 250
+                        },
+                        {
+                            "w": 300,
+                            "h": 600
+                        }
+                    ]
+                },
+                "ext": {
+                    "bidder": {
+                        "placementId": "test"
+                    }
+                }
+            }
+        ],
+        "app": {
+            "id": "1",
+            "bundle": "com.wls.testwlsapplication"
+        },
+        "device": {
+            "ip": "123.123.123.123",
+            "ifa": "sdjfksdf-dfsds-dsdg-dsgg"
+        }
+    },
+	"httpCalls": [{
+		"expectedRequest": {
+			"uri": "http://sa-lb.deliverimp.com/pserver",
+			"body": {
+                "id": "test-request-id",
+                "imp": [
+                    {
+                        "id": "test-imp-id",
+                        "banner": {
+                            "format": [
+                                {
+                                    "w": 300,
+                                    "h": 250
+                                },
+                                {
+                                    "w": 300,
+                                    "h": 600
+                                }
+                            ]
+                        },
+                        "ext": {
+                            "bidder": {
+                                "placementId": "test",
+                                "type": "publisher"
+                            }
+                        }
+                    }
+                ],
+                "app": {
+                    "id": "1",
+                    "bundle": "com.wls.testwlsapplication"
+                },
+                "device": {
+                    "ip": "123.123.123.123",
+                    "ifa": "sdjfksdf-dfsds-dsdg-dsgg"
+                }
+            }
+		},
+		"mockResponse": {
+			"status": 404,
+			"body": {}
+		}
+    }],
+    "expectedMakeBidsErrors": [
+        {
+          "value": "Unexpected status code: 404. Run with request.debug = 1 for more info.",
+          "comparison": "literal"
+        }
+    ]
+}
diff --git a/adapters/compass/params_test.go b/adapters/compass/params_test.go
new file mode 100644
index 00000000000..fca398b06fb
--- /dev/null
+++ b/adapters/compass/params_test.go
@@ -0,0 +1,47 @@
+package compass
+
+import (
+	"encoding/json"
+	"testing"
+
+	"github.com/prebid/prebid-server/openrtb_ext"
+)
+
+func TestValidParams(t *testing.T) {
+	validator, err := openrtb_ext.NewBidderParamsValidator("../../static/bidder-params")
+	if err != nil {
+		t.Fatalf("Failed to fetch the json schema. %v", err)
+	}
+
+	for _, p := range validParams {
+		if err := validator.Validate(openrtb_ext.BidderCompass, json.RawMessage(p)); err != nil {
+			t.Errorf("Schema rejected valid params: %s", p)
+		}
+	}
+}
+
+func TestInvalidParams(t *testing.T) {
+	validator, err := openrtb_ext.NewBidderParamsValidator("../../static/bidder-params")
+	if err != nil {
+		t.Fatalf("Failed to fetch the json schema. %v", err)
+	}
+
+	for _, p := range invalidParams {
+		if err := validator.Validate(openrtb_ext.BidderCompass, json.RawMessage(p)); err == nil {
+			t.Errorf("Schema allowed invalid params: %s", p)
+		}
+	}
+}
+
+var validParams = []string{
+	`{"placementId": "test"}`,
+	`{"placementId": "1"}`,
+	`{"endpointId": "test"}`,
+	`{"endpointId": "1"}`,
+}
+
+var invalidParams = []string{
+	`{"placementId": 42}`,
+	`{"endpointId": 42}`,
+	`{"placementId": "1", "endpointId": "1"}`,
+}
diff --git a/adapters/operaads/operaads.go b/adapters/operaads/operaads.go
index 5c072354da2..5912807b09f 100644
--- a/adapters/operaads/operaads.go
+++ b/adapters/operaads/operaads.go
@@ -2,8 +2,10 @@ package operaads
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net/http"
+	"strings"
 	"text/template"
 
 	"github.com/prebid/prebid-server/adapters"
@@ -19,6 +21,11 @@ type adapter struct {
 	epTemplate *template.Template
 }
 
+var (
+	errBannerFormatMiss = errors.New("Size information missing for banner")
+	errDeviceOrOSMiss   = errors.New("Impression is missing device OS information")
+)
+
 // Builder builds a new instance of the operaads adapter for the given bidder with the given config.
 func Builder(bidderName openrtb_ext.BidderName, config config.Adapter) (adapters.Bidder, error) {
 	epTemplate, err := template.New("endpoint").Parse(config.Endpoint)
@@ -41,12 +48,13 @@ func (a *adapter) MakeRequests(request *openrtb2.BidRequest, reqInfo *adapters.E
 
 	err := checkRequest(request)
 	if err != nil {
-		errs = append(errs, err)
+		errs = append(errs, &errortypes.BadInput{
+			Message: err.Error(),
+		})
 		return nil, errs
 	}
 
 	for _, imp := range request.Imp {
-		requestCopy := *request
 		var bidderExt adapters.ExtImpBidder
 		if err := json.Unmarshal(imp.Ext, &bidderExt); err != nil {
 			errs = append(errs, &errortypes.BadInput{
@@ -54,7 +62,6 @@ func (a *adapter) MakeRequests(request *openrtb2.BidRequest, reqInfo *adapters.E
 			})
 			continue
 		}
-
 		var operaadsExt openrtb_ext.ImpExtOperaads
 		if err := json.Unmarshal(bidderExt.Bidder, &operaadsExt); err != nil {
 			errs = append(errs, &errortypes.BadInput{
@@ -62,46 +69,78 @@ func (a *adapter) MakeRequests(request *openrtb2.BidRequest, reqInfo *adapters.E
 			})
 			continue
 		}
-
-		err := convertImpression(&imp)
+		macro := macros.EndpointTemplateParams{PublisherID: operaadsExt.PublisherID, AccountID: operaadsExt.EndpointID}
+		endpoint, err := macros.ResolveMacros(a.epTemplate, &macro)
 		if err != nil {
 			errs = append(errs, &errortypes.BadInput{
 				Message: err.Error(),
 			})
 			continue
 		}
-
 		imp.TagID = operaadsExt.PlacementID
-
-		requestCopy.Imp = []openrtb2.Imp{imp}
-		reqJSON, err := json.Marshal(&requestCopy)
-		if err != nil {
-			errs = append(errs, err)
-			return nil, errs
+		formats := make([]interface{}, 0, 1)
+		if imp.Native != nil {
+			formats = append(formats, imp.Native)
 		}
-
-		macro := macros.EndpointTemplateParams{PublisherID: operaadsExt.PublisherID, AccountID: operaadsExt.EndpointID}
-		endpoint, err := macros.ResolveMacros(a.epTemplate, &macro)
-		if err != nil {
-			errs = append(errs, err)
-			continue
+		if imp.Video != nil {
+			formats = append(formats, imp.Video)
 		}
-		reqData := &adapters.RequestData{
-			Method:  http.MethodPost,
-			Uri:     endpoint,
-			Body:    reqJSON,
-			Headers: headers,
+		if imp.Banner != nil {
+			formats = append(formats, imp.Banner)
+		}
+		for _, format := range formats {
+			req, err := flatImp(*request, imp, headers, endpoint, format)
+			if err != nil {
+				errs = append(errs, &errortypes.BadInput{
+					Message: err.Error(),
+				})
+				continue
+			}
+			if req != nil {
+				requestData = append(requestData, req)
+			}
 		}
-		requestData = append(requestData, reqData)
 	}
 	return requestData, errs
 }
 
+func flatImp(requestCopy openrtb2.BidRequest, impCopy openrtb2.Imp, headers http.Header, endpoint string, format interface{}) (*adapters.RequestData, error) {
+	switch format.(type) {
+	case *openrtb2.Video:
+		impCopy.Native = nil
+		impCopy.Banner = nil
+		impCopy.ID = buildOperaImpId(impCopy.ID, openrtb_ext.BidTypeVideo)
+	case *openrtb2.Banner:
+		impCopy.Video = nil
+		impCopy.Native = nil
+		impCopy.ID = buildOperaImpId(impCopy.ID, openrtb_ext.BidTypeBanner)
+	case *openrtb2.Native:
+		impCopy.Video = nil
+		impCopy.Banner = nil
+		impCopy.ID = buildOperaImpId(impCopy.ID, openrtb_ext.BidTypeNative)
+	default: // do not need flat
+		return nil, nil
+	}
+	err := convertImpression(&impCopy)
+	if err != nil {
+		return nil, err
+	}
+	requestCopy.Imp = []openrtb2.Imp{impCopy}
+	reqJSON, err := json.Marshal(&requestCopy)
+	if err != nil {
+		return nil, err
+	}
+	return &adapters.RequestData{
+		Method:  http.MethodPost,
+		Uri:     endpoint,
+		Body:    reqJSON,
+		Headers: headers,
+	}, nil
+}
+
 func checkRequest(request *openrtb2.BidRequest) error {
 	if request.Device == nil || len(request.Device.OS) == 0 {
-		return &errortypes.BadInput{
-			Message: "Impression is missing device OS information",
-		}
+		return errDeviceOrOSMiss
 	}
 
 	return nil
@@ -144,17 +183,12 @@ func convertBanner(banner *openrtb2.Banner) (*openrtb2.Banner, error) {
 	if banner.W == nil || banner.H == nil || *banner.W == 0 || *banner.H == 0 {
 		if len(banner.Format) > 0 {
 			f := banner.Format[0]
-
 			bannerCopy := *banner
-
 			bannerCopy.W = openrtb2.Int64Ptr(f.W)
 			bannerCopy.H = openrtb2.Int64Ptr(f.H)
-
 			return &bannerCopy, nil
 		} else {
-			return nil, &errortypes.BadInput{
-				Message: "Size information missing for banner",
-			}
+			return nil, errBannerFormatMiss
 		}
 	}
 	return banner, nil
@@ -185,14 +219,15 @@ func (a *adapter) MakeBids(internalRequest *openrtb2.BidRequest, externalRequest
 	}
 
 	bidResponse := adapters.NewBidderResponseWithBidsCapacity(1)
-
 	for _, sb := range parsedResponse.SeatBid {
 		for i := 0; i < len(sb.Bid); i++ {
 			bid := sb.Bid[i]
 			if bid.Price != 0 {
+				var bidType openrtb_ext.BidType
+				bid.ImpID, bidType = parseOriginImpId(bid.ImpID)
 				bidResponse.Bids = append(bidResponse.Bids, &adapters.TypedBid{
 					Bid:     &bid,
-					BidType: getMediaTypeForImp(bid.ImpID, internalRequest.Imp),
+					BidType: bidType,
 				})
 			}
 		}
@@ -200,17 +235,14 @@ func (a *adapter) MakeBids(internalRequest *openrtb2.BidRequest, externalRequest
 	return bidResponse, nil
 }
 
-func getMediaTypeForImp(impId string, imps []openrtb2.Imp) openrtb_ext.BidType {
-	mediaType := openrtb_ext.BidTypeBanner
-	for _, imp := range imps {
-		if imp.ID == impId {
-			if imp.Video != nil {
-				mediaType = openrtb_ext.BidTypeVideo
-			} else if imp.Native != nil {
-				mediaType = openrtb_ext.BidTypeNative
-			}
-			return mediaType
-		}
+func buildOperaImpId(originId string, bidType openrtb_ext.BidType) string {
+	return strings.Join([]string{originId, "opa", string(bidType)}, ":")
+}
+
+func parseOriginImpId(impId string) (originId string, bidType openrtb_ext.BidType) {
+	items := strings.Split(impId, ":")
+	if len(items) < 2 {
+		return impId, ""
 	}
-	return mediaType
+	return strings.Join(items[:len(items)-2], ":"), openrtb_ext.BidType(items[len(items)-1])
 }
diff --git a/adapters/operaads/operaadstest/exemplary/multiformat.json b/adapters/operaads/operaadstest/exemplary/multiformat.json
new file mode 100644
index 00000000000..6f631f67006
--- /dev/null
+++ b/adapters/operaads/operaadstest/exemplary/multiformat.json
@@ -0,0 +1,246 @@
+{
+  "mockBidRequest": {
+    "id": "some-req-id",
+    "imp": [
+      {
+        "id": "some-imp-id",
+        "native": {
+          "request": "{\"native\":{\"ver\":\"1.1\",\"layout\":3,\"assets\":[{\"id\":1,\"required\":1,\"title\":{\"len\":90}},{\"id\":2,\"required\":1,\"img\":{\"type\":3,\"wmin\":344,\"hmin\":194}},{\"id\":3,\"required\":1,\"img\":{\"type\":1,\"w\":128,\"wmin\":80,\"h\":128,\"hmin\":80}},{\"id\":4,\"required\":1,\"data\":{\"type\":2,\"len\":90}},{\"id\":6,\"data\":{\"type\":12,\"len\":15}}]}}",
+          "ver": "1.1"
+        },
+        "banner": {
+          "format": [
+            {
+              "w": 300,
+              "h": 250
+            }
+          ]
+        },
+        "ext": {
+          "bidder": {
+            "placementId": "s123456",
+            "endpointId": "ep19978",
+            "publisherId": "pub123"
+          }
+        }
+      }
+    ],
+    "site": {
+      "domain": "example.com",
+      "page": "example.com"
+    },
+    "device": {
+      "ip": "152.193.6.74",
+      "os": "android"
+    },
+    "user": {
+      "id": "db089de9-a62e-4861-a881-0ff15e052516",
+      "buyeruid": "8299345306627569435"
+    },
+    "tmax": 500
+  },
+  "httpcalls": [
+    {
+      "expectedRequest": {
+        "uri": "http://example.com/operaads/ortb/v2/pub123?ep=ep19978",
+        "body": {
+          "id": "some-req-id",
+          "imp": [
+            {
+              "id": "some-imp-id:opa:native",
+              "tagid": "s123456",
+              "ext": {
+                "bidder": {
+                  "placementId": "s123456",
+                  "endpointId": "ep19978",
+                  "publisherId": "pub123"
+                }
+              },
+              "native": {
+                "request": "{\"native\":{\"ver\":\"1.1\",\"layout\":3,\"assets\":[{\"id\":1,\"required\":1,\"title\":{\"len\":90}},{\"id\":2,\"required\":1,\"img\":{\"type\":3,\"wmin\":344,\"hmin\":194}},{\"id\":3,\"required\":1,\"img\":{\"type\":1,\"w\":128,\"wmin\":80,\"h\":128,\"hmin\":80}},{\"id\":4,\"required\":1,\"data\":{\"type\":2,\"len\":90}},{\"id\":6,\"data\":{\"type\":12,\"len\":15}}]}}",
+                "ver": "1.1"
+              }
+            }
+          ],
+          "site": {
+            "domain": "example.com",
+            "page": "example.com"
+          },
+          "device": {
+            "ip": "152.193.6.74",
+            "os": "android"
+          },
+          "user": {
+            "id": "db089de9-a62e-4861-a881-0ff15e052516",
+            "buyeruid": "8299345306627569435"
+          },
+          "tmax": 500
+        }
+      },
+      "mockResponse": {
+        "status": 200,
+        "body": {
+          "id": "some-req-id",
+          "seatbid": [
+            {
+              "bid": [
+                {
+                  "id": "928185755156387460",
+                  "impid": "some-imp-id:opa:native",
+                  "price": 1,
+                  "adid": "69595837",
+                  "adm": "{\"assets\":[{\"id\": 2,\"img\":{\"url\":\"http://example.com/p/creative-image/5e/b6/de/c3/5eb6dec3-4854-4dcd-980a-347f36ab502e.jpg\",\"w\": 344,\"h\": 194}},{\"id\": 3,\"img\":{\"url\":\"http://example.com/p/creative-image/5e/b6/de/c3/5eb6dec3-4854-4dcd-980a-347f36ab502e.jpg\",\"w\": 100,\"h\": 100}} ,{\"id\": 1,\"title\":{\"text\":\"This is an example Prebid Native creative\"}},{\"id\": 4,\"data\":{\"value\":\"This is a Prebid Native Creative. There are many like it, but this one is mine.\"}},{\"id\": 6,\"data\":{\"value\":\"Please.\"}} ],\"link\":{\"url\":\"http://example.com/click?AAAAAAAA8D8AAAAAAADwPwAAAAAAAAAAAAAAAAAA8D8AAAAAAADwPwhdYz3ZyNFNG3fXpZUyLXNZ0o5aAAAAACrElgC-AwAAvgMAAAIAAAC98iUEeP4QAAAAAABVU0QAVVNEAAEAAQARIAAAAAABAgQCAAAAAAEAhBaSXgAAAAA./pp=${AUCTION_PRICE}/cnd=%21OwwGAQiGmooHEL3llyEY-PxDIAQoADoRZGVmYXVsdCNOWU0yOjQwMjM./bn=75922/test=1/referrer=prebid.org/clickenc=http%3A%2F%2Fprebid.org%2Fdev-docs%2Fshow-native-ads.html\"},\"imptrackers\":[\"http://example.com/openrtb_win?e=wqT_3QLFBqBFAwAAAwDWAAUBCNmku9QFEIi6jeuTm_LoTRib7t2u2tLMlnMqNgkAAAECCPA_EQEHEAAA8D8ZCQkIAAAhCQkI8D8pEQkAMQkJqAAAMKqI2wQ4vgdAvgdIAlC95ZchWPj8Q2AAaJFAeJLRBIABAYoBA1VTRJIFBvBQmAEBoAEBqAEBsAEAuAECwAEEyAEC0AEJ2AEA4AEB8AEAigI7dWYoJ2EnLCAxMzc2ODYwLCAxNTE5MzA5NDAxKTt1ZigncicsIDY5NTk1ODM3Nh4A8IqSAvUBIXRETkdfUWlHbW9vSEVMM2xseUVZQUNENF9FTXdBRGdBUUFSSXZnZFFxb2piQkZnQVlMTURhQUJ3QUhnQWdBRUFpQUVBa0FFQm1BRUJvQUVCcUFFRHNBRUF1UUVwaTRpREFBRHdQOEVCS1l1SWd3QUE4RF9KQVhfelYzek1zXzBfMlFFQUFBAQMkRHdQLUFCQVBVQgEOLEFKZ0NBS0FDQUxVQwUQBEwwCQjwTE1BQ0FNZ0NBT0FDQU9nQ0FQZ0NBSUFEQVpBREFKZ0RBYWdEaHBxS0I3b0RFV1JsWm1GMWJIUWpUbGxOTWpvME1ESXqaAjkhT3d3R0FRNvgA8E4tUHhESUFRb0FEb1JaR1ZtWVhWc2RDTk9XVTB5T2pRd01qTS7YAugH4ALH0wHqAgpwcmViaWQub3Jn8gIRCgZBRFZfSUQSBzEzNzY4NjDyARQMQ1BHXwEUNDM1MDMwOTjyAhEKBUNQARPwmQgxNDg0NzIzOIADAYgDAZADAJgDFKADAaoDAMADkBzIAwDYAwDgAwDoAwD4AwOABACSBAkvb3BlbnJ0YjKYBACiBAwxNTIuMTkzLjYuNzSoBJrMI7IEDAgAEAAYACAAMAA4ALgEAMAEAMgEANIEEWRlZmF1bHQjTllNMjo0MDIz2gQCCADgBADwBL3llyGIBQGYBQCgBf____8FA1ABqgULc29tZS1yZXEtaWTABQDJBQAFARTwP9IFCQkFC2QAAADYBQHgBQHwBd4C-gUECAAQAJAGAZgGAA..&s=08b1535744639c904684afe46e3c6c0e4786089f&test=1&referrer=prebid.org&pp=${AUCTION_PRICE}\"]}",
+                  "adomain": [
+                    "example.com"
+                  ],
+                  "iurl": "http://example.com/cr?id=69595837",
+                  "cid": "958",
+                  "crid": "69595837",
+                  "cat": [
+                    "IAB3-1"
+                  ],
+                  "ext": {
+                  }
+                }
+              ],
+              "seat": "958"
+            }
+          ],
+          "bidid": "8141327771600527856",
+          "cur": "USD"
+        }
+      }
+    },
+    {
+      "expectedRequest": {
+        "uri": "http://example.com/operaads/ortb/v2/pub123?ep=ep19978",
+        "body": {
+          "id": "some-req-id",
+          "imp": [
+            {
+              "id": "some-imp-id:opa:banner",
+              "tagid": "s123456",
+              "ext": {
+                "bidder": {
+                  "placementId": "s123456",
+                  "endpointId": "ep19978",
+                  "publisherId": "pub123"
+                }
+              },
+              "banner": {
+                "format": [
+                  {
+                    "w": 300,
+                    "h": 250
+                  }
+                ],
+                "w": 300,
+                "h": 250
+              }
+            }
+          ],
+          "site": {
+            "domain": "example.com",
+            "page": "example.com"
+          },
+          "device": {
+            "ip": "152.193.6.74",
+            "os": "android"
+          },
+          "user": {
+            "id": "db089de9-a62e-4861-a881-0ff15e052516",
+            "buyeruid": "8299345306627569435"
+          },
+          "tmax": 500
+        }
+      },
+      "mockResponse": {
+        "status": 200,
+        "body": {
+          "id": "some-req-id",
+          "seatbid": [
+            {
+              "bid": [
+                {
+                  "id": "9281857551563874601",
+                  "impid": "some-imp-id:opa:banner",
+                  "price": 1,
+                  "adid": "69595837",
+                  "adm": "some-test-ad",
+                  "adomain": [
+                    "example.com"
+                  ],
+                  "iurl": "http://example.com/cr?id=69595837",
+                  "cid": "958",
+                  "crid": "69595837",
+                  "cat": [
+                    "IAB3-1"
+                  ],
+                  "ext": {
+                  }
+                }
+              ],
+              "seat": "958"
+            }
+          ],
+          "bidid": "81413277716005278561",
+          "cur": "USD"
+        }
+      }
+    }
+  ],
+  "expectedBidResponses": [
+    {
+      "currency": "USD",
+      "bids": [
+        {
+          "bid": {
+            "id": "928185755156387460",
+            "impid": "some-imp-id",
+            "price": 1,
+            "adm": "{\"assets\":[{\"id\": 2,\"img\":{\"url\":\"http://example.com/p/creative-image/5e/b6/de/c3/5eb6dec3-4854-4dcd-980a-347f36ab502e.jpg\",\"w\": 344,\"h\": 194}},{\"id\": 3,\"img\":{\"url\":\"http://example.com/p/creative-image/5e/b6/de/c3/5eb6dec3-4854-4dcd-980a-347f36ab502e.jpg\",\"w\": 100,\"h\": 100}} ,{\"id\": 1,\"title\":{\"text\":\"This is an example Prebid Native creative\"}},{\"id\": 4,\"data\":{\"value\":\"This is a Prebid Native Creative. There are many like it, but this one is mine.\"}},{\"id\": 6,\"data\":{\"value\":\"Please.\"}} ],\"link\":{\"url\":\"http://example.com/click?AAAAAAAA8D8AAAAAAADwPwAAAAAAAAAAAAAAAAAA8D8AAAAAAADwPwhdYz3ZyNFNG3fXpZUyLXNZ0o5aAAAAACrElgC-AwAAvgMAAAIAAAC98iUEeP4QAAAAAABVU0QAVVNEAAEAAQARIAAAAAABAgQCAAAAAAEAhBaSXgAAAAA./pp=${AUCTION_PRICE}/cnd=%21OwwGAQiGmooHEL3llyEY-PxDIAQoADoRZGVmYXVsdCNOWU0yOjQwMjM./bn=75922/test=1/referrer=prebid.org/clickenc=http%3A%2F%2Fprebid.org%2Fdev-docs%2Fshow-native-ads.html\"},\"imptrackers\":[\"http://example.com/openrtb_win?e=wqT_3QLFBqBFAwAAAwDWAAUBCNmku9QFEIi6jeuTm_LoTRib7t2u2tLMlnMqNgkAAAECCPA_EQEHEAAA8D8ZCQkIAAAhCQkI8D8pEQkAMQkJqAAAMKqI2wQ4vgdAvgdIAlC95ZchWPj8Q2AAaJFAeJLRBIABAYoBA1VTRJIFBvBQmAEBoAEBqAEBsAEAuAECwAEEyAEC0AEJ2AEA4AEB8AEAigI7dWYoJ2EnLCAxMzc2ODYwLCAxNTE5MzA5NDAxKTt1ZigncicsIDY5NTk1ODM3Nh4A8IqSAvUBIXRETkdfUWlHbW9vSEVMM2xseUVZQUNENF9FTXdBRGdBUUFSSXZnZFFxb2piQkZnQVlMTURhQUJ3QUhnQWdBRUFpQUVBa0FFQm1BRUJvQUVCcUFFRHNBRUF1UUVwaTRpREFBRHdQOEVCS1l1SWd3QUE4RF9KQVhfelYzek1zXzBfMlFFQUFBAQMkRHdQLUFCQVBVQgEOLEFKZ0NBS0FDQUxVQwUQBEwwCQjwTE1BQ0FNZ0NBT0FDQU9nQ0FQZ0NBSUFEQVpBREFKZ0RBYWdEaHBxS0I3b0RFV1JsWm1GMWJIUWpUbGxOTWpvME1ESXqaAjkhT3d3R0FRNvgA8E4tUHhESUFRb0FEb1JaR1ZtWVhWc2RDTk9XVTB5T2pRd01qTS7YAugH4ALH0wHqAgpwcmViaWQub3Jn8gIRCgZBRFZfSUQSBzEzNzY4NjDyARQMQ1BHXwEUNDM1MDMwOTjyAhEKBUNQARPwmQgxNDg0NzIzOIADAYgDAZADAJgDFKADAaoDAMADkBzIAwDYAwDgAwDoAwD4AwOABACSBAkvb3BlbnJ0YjKYBACiBAwxNTIuMTkzLjYuNzSoBJrMI7IEDAgAEAAYACAAMAA4ALgEAMAEAMgEANIEEWRlZmF1bHQjTllNMjo0MDIz2gQCCADgBADwBL3llyGIBQGYBQCgBf____8FA1ABqgULc29tZS1yZXEtaWTABQDJBQAFARTwP9IFCQkFC2QAAADYBQHgBQHwBd4C-gUECAAQAJAGAZgGAA..&s=08b1535744639c904684afe46e3c6c0e4786089f&test=1&referrer=prebid.org&pp=${AUCTION_PRICE}\"]}",
+            "adid": "69595837",
+            "adomain": [
+              "example.com"
+            ],
+            "iurl": "http://example.com/cr?id=69595837",
+            "cid": "958",
+            "crid": "69595837",
+            "cat": [
+              "IAB3-1"
+            ],
+            "ext": {
+            }
+          },
+          "type": "native"
+        }
+      ]
+    },
+    {
+      "currency": "USD",
+      "bids": [
+        {
+          "bid": {
+            "id": "9281857551563874601",
+            "impid": "some-imp-id",
+            "price": 1,
+            "adm": "some-test-ad",
+            "adid": "69595837",
+            "adomain": [
+              "example.com"
+            ],
+            "iurl": "http://example.com/cr?id=69595837",
+            "cid": "958",
+            "crid": "69595837",
+            "cat": [
+              "IAB3-1"
+            ],
+            "ext": {
+            }
+          },
+          "type": "banner"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/adapters/operaads/operaadstest/exemplary/native.json b/adapters/operaads/operaadstest/exemplary/native.json
index 4491bd150e4..4b3da8d7ea6 100644
--- a/adapters/operaads/operaadstest/exemplary/native.json
+++ b/adapters/operaads/operaadstest/exemplary/native.json
@@ -39,7 +39,7 @@
           "id":"some-req-id",
           "imp":[
             {
-              "id":"some-imp-id",
+              "id":"some-imp-id:opa:native",
               "tagid":"s123456",
               "ext":{
                 "bidder":{
@@ -78,7 +78,7 @@
               "bid":[
                 {
                   "id":"928185755156387460",
-                  "impid":"some-imp-id",
+                  "impid":"some-imp-id:opa:native",
                   "price":1,
                   "adid":"69595837",
                   "adm":"{\"assets\":[{\"id\": 2,\"img\":{\"url\":\"http://example.com/p/creative-image/5e/b6/de/c3/5eb6dec3-4854-4dcd-980a-347f36ab502e.jpg\",\"w\": 344,\"h\": 194}},{\"id\": 3,\"img\":{\"url\":\"http://example.com/p/creative-image/5e/b6/de/c3/5eb6dec3-4854-4dcd-980a-347f36ab502e.jpg\",\"w\": 100,\"h\": 100}} ,{\"id\": 1,\"title\":{\"text\":\"This is an example Prebid Native creative\"}},{\"id\": 4,\"data\":{\"value\":\"This is a Prebid Native Creative. There are many like it, but this one is mine.\"}},{\"id\": 6,\"data\":{\"value\":\"Please.\"}} ],\"link\":{\"url\":\"http://example.com/click?AAAAAAAA8D8AAAAAAADwPwAAAAAAAAAAAAAAAAAA8D8AAAAAAADwPwhdYz3ZyNFNG3fXpZUyLXNZ0o5aAAAAACrElgC-AwAAvgMAAAIAAAC98iUEeP4QAAAAAABVU0QAVVNEAAEAAQARIAAAAAABAgQCAAAAAAEAhBaSXgAAAAA./pp=${AUCTION_PRICE}/cnd=%21OwwGAQiGmooHEL3llyEY-PxDIAQoADoRZGVmYXVsdCNOWU0yOjQwMjM./bn=75922/test=1/referrer=prebid.org/clickenc=http%3A%2F%2Fprebid.org%2Fdev-docs%2Fshow-native-ads.html\"},\"imptrackers\":[\"http://example.com/openrtb_win?e=wqT_3QLFBqBFAwAAAwDWAAUBCNmku9QFEIi6jeuTm_LoTRib7t2u2tLMlnMqNgkAAAECCPA_EQEHEAAA8D8ZCQkIAAAhCQkI8D8pEQkAMQkJqAAAMKqI2wQ4vgdAvgdIAlC95ZchWPj8Q2AAaJFAeJLRBIABAYoBA1VTRJIFBvBQmAEBoAEBqAEBsAEAuAECwAEEyAEC0AEJ2AEA4AEB8AEAigI7dWYoJ2EnLCAxMzc2ODYwLCAxNTE5MzA5NDAxKTt1ZigncicsIDY5NTk1ODM3Nh4A8IqSAvUBIXRETkdfUWlHbW9vSEVMM2xseUVZQUNENF9FTXdBRGdBUUFSSXZnZFFxb2piQkZnQVlMTURhQUJ3QUhnQWdBRUFpQUVBa0FFQm1BRUJvQUVCcUFFRHNBRUF1UUVwaTRpREFBRHdQOEVCS1l1SWd3QUE4RF9KQVhfelYzek1zXzBfMlFFQUFBAQMkRHdQLUFCQVBVQgEOLEFKZ0NBS0FDQUxVQwUQBEwwCQjwTE1BQ0FNZ0NBT0FDQU9nQ0FQZ0NBSUFEQVpBREFKZ0RBYWdEaHBxS0I3b0RFV1JsWm1GMWJIUWpUbGxOTWpvME1ESXqaAjkhT3d3R0FRNvgA8E4tUHhESUFRb0FEb1JaR1ZtWVhWc2RDTk9XVTB5T2pRd01qTS7YAugH4ALH0wHqAgpwcmViaWQub3Jn8gIRCgZBRFZfSUQSBzEzNzY4NjDyARQMQ1BHXwEUNDM1MDMwOTjyAhEKBUNQARPwmQgxNDg0NzIzOIADAYgDAZADAJgDFKADAaoDAMADkBzIAwDYAwDgAwDoAwD4AwOABACSBAkvb3BlbnJ0YjKYBACiBAwxNTIuMTkzLjYuNzSoBJrMI7IEDAgAEAAYACAAMAA4ALgEAMAEAMgEANIEEWRlZmF1bHQjTllNMjo0MDIz2gQCCADgBADwBL3llyGIBQGYBQCgBf____8FA1ABqgULc29tZS1yZXEtaWTABQDJBQAFARTwP9IFCQkFC2QAAADYBQHgBQHwBd4C-gUECAAQAJAGAZgGAA..&s=08b1535744639c904684afe46e3c6c0e4786089f&test=1&referrer=prebid.org&pp=${AUCTION_PRICE}\"]}",
diff --git a/adapters/operaads/operaadstest/exemplary/simple-banner.json b/adapters/operaads/operaadstest/exemplary/simple-banner.json
index 53b19c82c2a..8a7c12695a7 100644
--- a/adapters/operaads/operaadstest/exemplary/simple-banner.json
+++ b/adapters/operaads/operaadstest/exemplary/simple-banner.json
@@ -64,7 +64,7 @@
           },
           "imp": [
             {
-              "id": "test-imp-id",
+              "id": "test-imp-id:opa:banner",
               "tagid": "s17890",
               "banner": {
                 "h": 250,
@@ -111,7 +111,7 @@
                 {
                   "price": 0.5,
                   "adm": "some-test-ad",
-                  "impid": "1",
+                  "impid": "test-imp-id:opa:banner",
                   "auid": 46,
                   "id": "1",
                   "h": 250,
@@ -125,21 +125,21 @@
               "seat": "51"
             }
           ],
-          "bidid":"8141327771600527856",
-          "cur":"USD"
+          "bidid": "8141327771600527856",
+          "cur": "USD"
         }
       }
     }
   ],
   "expectedBidResponses": [
     {
-      "currency":"USD",
+      "currency": "USD",
       "bids": [
         {
           "bid": {
             "price": 0.5,
             "adm": "some-test-ad",
-            "impid": "1",
+            "impid": "test-imp-id",
             "id": "1",
             "h": 250,
             "adomain": [
diff --git a/adapters/operaads/operaadstest/exemplary/video.json b/adapters/operaads/operaadstest/exemplary/video.json
index a76bbe5ccf8..74f7665bfa3 100644
--- a/adapters/operaads/operaadstest/exemplary/video.json
+++ b/adapters/operaads/operaadstest/exemplary/video.json
@@ -37,9 +37,9 @@
         },
         "ext": {
           "bidder": {
-            "placementId":"s00000",
-            "endpointId":"ep00000",
-            "publisherId":"pub00000"
+            "placementId": "s00000",
+            "endpointId": "ep00000",
+            "publisherId": "pub00000"
           }
         }
       }
@@ -63,7 +63,7 @@
           "id": "test-video-request",
           "imp": [
             {
-              "id": "test-video-imp",
+              "id": "test-video-imp:opa:video",
               "tagid": "s00000",
               "video": {
                 "w": 640,
@@ -98,9 +98,9 @@
               },
               "ext": {
                 "bidder": {
-                  "placementId":"s00000",
-                  "endpointId":"ep00000",
-                  "publisherId":"pub00000"
+                  "placementId": "s00000",
+                  "endpointId": "ep00000",
+                  "publisherId": "pub00000"
                 }
               }
             }
@@ -127,7 +127,7 @@
               "bid": [
                 {
                   "id": "7706636740145184841",
-                  "impid": "test-video-imp",
+                  "impid": "test-video-imp:opa:video",
                   "price": 0.5,
                   "adid": "29681110",
                   "adm": "some-test-ad",
diff --git a/adapters/operaads/operaadstest/supplemental/badrequest.json b/adapters/operaads/operaadstest/supplemental/badrequest.json
index ff3fe071c4a..9e5af929c32 100644
--- a/adapters/operaads/operaadstest/supplemental/badrequest.json
+++ b/adapters/operaads/operaadstest/supplemental/badrequest.json
@@ -39,7 +39,7 @@
           "id":"some-req-id",
           "imp":[
             {
-              "id":"some-imp-id",
+              "id":"some-imp-id:opa:native",
               "tagid":"s123456",
               "ext":{
                 "bidder":{
diff --git a/adapters/operaads/operaadstest/supplemental/miss-native.json b/adapters/operaads/operaadstest/supplemental/miss-native.json
index 918bbc4ded5..5acde96be77 100644
--- a/adapters/operaads/operaadstest/supplemental/miss-native.json
+++ b/adapters/operaads/operaadstest/supplemental/miss-native.json
@@ -39,7 +39,7 @@
           "id":"some-req-id",
           "imp":[
             {
-              "id":"some-imp-id",
+              "id":"some-imp-id:opa:native",
               "tagid":"s123456",
               "ext":{
                 "bidder":{
@@ -78,7 +78,7 @@
               "bid":[
                 {
                   "id":"928185755156387460",
-                  "impid":"some-imp-id",
+                  "impid":"some-imp-id:opa:native",
                   "price":1,
                   "adid":"69595837",
                   "adm":"{\"assets\":[{\"id\": 2,\"img\":{\"url\":\"http://example.com/p/creative-image/5e/b6/de/c3/5eb6dec3-4854-4dcd-980a-347f36ab502e.jpg\",\"w\": 344,\"h\": 194}},{\"id\": 3,\"img\":{\"url\":\"http://example.com/p/creative-image/5e/b6/de/c3/5eb6dec3-4854-4dcd-980a-347f36ab502e.jpg\",\"w\": 100,\"h\": 100}} ,{\"id\": 1,\"title\":{\"text\":\"This is an example Prebid Native creative\"}},{\"id\": 4,\"data\":{\"value\":\"This is a Prebid Native Creative. There are many like it, but this one is mine.\"}},{\"id\": 6,\"data\":{\"value\":\"Please.\"}} ],\"link\":{\"url\":\"http://example.com/click?AAAAAAAA8D8AAAAAAADwPwAAAAAAAAAAAAAAAAAA8D8AAAAAAADwPwhdYz3ZyNFNG3fXpZUyLXNZ0o5aAAAAACrElgC-AwAAvgMAAAIAAAC98iUEeP4QAAAAAABVU0QAVVNEAAEAAQARIAAAAAABAgQCAAAAAAEAhBaSXgAAAAA./pp=${AUCTION_PRICE}/cnd=%21OwwGAQiGmooHEL3llyEY-PxDIAQoADoRZGVmYXVsdCNOWU0yOjQwMjM./bn=75922/test=1/referrer=prebid.org/clickenc=http%3A%2F%2Fprebid.org%2Fdev-docs%2Fshow-native-ads.html\"},\"imptrackers\":[\"http://example.com/openrtb_win?e=wqT_3QLFBqBFAwAAAwDWAAUBCNmku9QFEIi6jeuTm_LoTRib7t2u2tLMlnMqNgkAAAECCPA_EQEHEAAA8D8ZCQkIAAAhCQkI8D8pEQkAMQkJqAAAMKqI2wQ4vgdAvgdIAlC95ZchWPj8Q2AAaJFAeJLRBIABAYoBA1VTRJIFBvBQmAEBoAEBqAEBsAEAuAECwAEEyAEC0AEJ2AEA4AEB8AEAigI7dWYoJ2EnLCAxMzc2ODYwLCAxNTE5MzA5NDAxKTt1ZigncicsIDY5NTk1ODM3Nh4A8IqSAvUBIXRETkdfUWlHbW9vSEVMM2xseUVZQUNENF9FTXdBRGdBUUFSSXZnZFFxb2piQkZnQVlMTURhQUJ3QUhnQWdBRUFpQUVBa0FFQm1BRUJvQUVCcUFFRHNBRUF1UUVwaTRpREFBRHdQOEVCS1l1SWd3QUE4RF9KQVhfelYzek1zXzBfMlFFQUFBAQMkRHdQLUFCQVBVQgEOLEFKZ0NBS0FDQUxVQwUQBEwwCQjwTE1BQ0FNZ0NBT0FDQU9nQ0FQZ0NBSUFEQVpBREFKZ0RBYWdEaHBxS0I3b0RFV1JsWm1GMWJIUWpUbGxOTWpvME1ESXqaAjkhT3d3R0FRNvgA8E4tUHhESUFRb0FEb1JaR1ZtWVhWc2RDTk9XVTB5T2pRd01qTS7YAugH4ALH0wHqAgpwcmViaWQub3Jn8gIRCgZBRFZfSUQSBzEzNzY4NjDyARQMQ1BHXwEUNDM1MDMwOTjyAhEKBUNQARPwmQgxNDg0NzIzOIADAYgDAZADAJgDFKADAaoDAMADkBzIAwDYAwDgAwDoAwD4AwOABACSBAkvb3BlbnJ0YjKYBACiBAwxNTIuMTkzLjYuNzSoBJrMI7IEDAgAEAAYACAAMAA4ALgEAMAEAMgEANIEEWRlZmF1bHQjTllNMjo0MDIz2gQCCADgBADwBL3llyGIBQGYBQCgBf____8FA1ABqgULc29tZS1yZXEtaWTABQDJBQAFARTwP9IFCQkFC2QAAADYBQHgBQHwBd4C-gUECAAQAJAGAZgGAA..&s=08b1535744639c904684afe46e3c6c0e4786089f&test=1&referrer=prebid.org&pp=${AUCTION_PRICE}\"]}",
diff --git a/adapters/operaads/operaadstest/supplemental/nocontent.json b/adapters/operaads/operaadstest/supplemental/nocontent.json
index d6baf35d4a6..219a2c6912d 100644
--- a/adapters/operaads/operaadstest/supplemental/nocontent.json
+++ b/adapters/operaads/operaadstest/supplemental/nocontent.json
@@ -39,7 +39,7 @@
           "id": "some-req-id",
           "imp": [
             {
-              "id": "some-imp-id",
+              "id": "some-imp-id:opa:native",
               "tagid": "s123456",
               "ext": {
                 "bidder": {
diff --git a/adapters/operaads/operaadstest/supplemental/unexcept-statuscode.json b/adapters/operaads/operaadstest/supplemental/unexcept-statuscode.json
index a6c8c5052ae..3d64f9cbf2c 100644
--- a/adapters/operaads/operaadstest/supplemental/unexcept-statuscode.json
+++ b/adapters/operaads/operaadstest/supplemental/unexcept-statuscode.json
@@ -39,7 +39,7 @@
           "id":"some-req-id",
           "imp":[
             {
-              "id":"some-imp-id",
+              "id":"some-imp-id:opa:native",
               "tagid":"s123456",
               "ext":{
                 "bidder":{
diff --git a/adapters/orbidder/orbidder.go b/adapters/orbidder/orbidder.go
index 77985c8dae0..f2dda85e290 100644
--- a/adapters/orbidder/orbidder.go
+++ b/adapters/orbidder/orbidder.go
@@ -3,13 +3,13 @@ package orbidder
 import (
 	"encoding/json"
 	"fmt"
-	"net/http"
-
 	"github.com/mxmCherry/openrtb/v15/openrtb2"
 	"github.com/prebid/prebid-server/adapters"
 	"github.com/prebid/prebid-server/config"
 	"github.com/prebid/prebid-server/errortypes"
 	"github.com/prebid/prebid-server/openrtb_ext"
+	"net/http"
+	"strings"
 )
 
 type OrbidderAdapter struct {
@@ -18,30 +18,11 @@ type OrbidderAdapter struct {
 
 // MakeRequests makes the HTTP requests which should be made to fetch bids from orbidder.
 func (rcv *OrbidderAdapter) MakeRequests(request *openrtb2.BidRequest, reqInfo *adapters.ExtraRequestInfo) ([]*adapters.RequestData, []error) {
-	var errs []error
-	var validImps []openrtb2.Imp
-
-	// check if imps exists, if not return error and do send request to orbidder.
-	if len(request.Imp) == 0 {
-		return nil, []error{&errortypes.BadInput{
-			Message: "No impressions in request",
-		}}
-	}
-
-	// validate imps
-	for _, imp := range request.Imp {
-		if err := preprocess(&imp); err != nil {
-			errs = append(errs, err)
-			continue
-		}
-		validImps = append(validImps, imp)
-	}
-
+	validImps, errs := getValidImpressions(request, reqInfo)
 	if len(validImps) == 0 {
 		return nil, errs
 	}
 
-	//set imp array to only valid imps
 	request.Imp = validImps
 
 	requestBodyJSON, err := json.Marshal(request)
@@ -55,14 +36,34 @@ func (rcv *OrbidderAdapter) MakeRequests(request *openrtb2.BidRequest, reqInfo *
 	headers.Add("Accept", "application/json")
 
 	return []*adapters.RequestData{{
-		Method:  "POST",
+		Method:  http.MethodPost,
 		Uri:     rcv.endpoint,
 		Body:    requestBodyJSON,
 		Headers: headers,
 	}}, errs
 }
 
-func preprocess(imp *openrtb2.Imp) error {
+// getValidImpressions validate imps and check for bid floor currency. Convert to EUR if necessary
+func getValidImpressions(request *openrtb2.BidRequest, reqInfo *adapters.ExtraRequestInfo) ([]openrtb2.Imp, []error) {
+	var errs []error
+	var validImps []openrtb2.Imp
+
+	for _, imp := range request.Imp {
+		if err := preprocessBidFloorCurrency(&imp, reqInfo); err != nil {
+			errs = append(errs, err)
+			continue
+		}
+
+		if err := preprocessExtensions(&imp); err != nil {
+			errs = append(errs, err)
+			continue
+		}
+		validImps = append(validImps, imp)
+	}
+	return validImps, errs
+}
+
+func preprocessExtensions(imp *openrtb2.Imp) error {
 	var bidderExt adapters.ExtImpBidder
 	if err := json.Unmarshal(imp.Ext, &bidderExt); err != nil {
 		return &errortypes.BadInput{
@@ -80,8 +81,21 @@ func preprocess(imp *openrtb2.Imp) error {
 	return nil
 }
 
+func preprocessBidFloorCurrency(imp *openrtb2.Imp, reqInfo *adapters.ExtraRequestInfo) error {
+	// we expect every currency related data to be EUR
+	if imp.BidFloor > 0 && strings.ToUpper(imp.BidFloorCur) != "EUR" && imp.BidFloorCur != "" {
+		if convertedValue, err := reqInfo.ConvertCurrency(imp.BidFloor, imp.BidFloorCur, "EUR"); err != nil {
+			return err
+		} else {
+			imp.BidFloor = convertedValue
+		}
+	}
+	imp.BidFloorCur = "EUR"
+	return nil
+}
+
 // MakeBids unpacks server response into Bids.
-func (rcv OrbidderAdapter) MakeBids(internalRequest *openrtb2.BidRequest, externalRequest *adapters.RequestData, response *adapters.ResponseData) (*adapters.BidderResponse, []error) {
+func (rcv OrbidderAdapter) MakeBids(_ *openrtb2.BidRequest, _ *adapters.RequestData, response *adapters.ResponseData) (*adapters.BidderResponse, []error) {
 	if response.StatusCode == http.StatusNoContent {
 		return nil, nil
 	}
@@ -125,7 +139,7 @@ func (rcv OrbidderAdapter) MakeBids(internalRequest *openrtb2.BidRequest, extern
 }
 
 // Builder builds a new instance of the Orbidder adapter for the given bidder with the given config.
-func Builder(bidderName openrtb_ext.BidderName, config config.Adapter) (adapters.Bidder, error) {
+func Builder(_ openrtb_ext.BidderName, config config.Adapter) (adapters.Bidder, error) {
 	bidder := &OrbidderAdapter{
 		endpoint: config.Endpoint,
 	}
diff --git a/adapters/orbidder/orbidder_test.go b/adapters/orbidder/orbidder_test.go
index 0eaed23a971..bbda1c06223 100644
--- a/adapters/orbidder/orbidder_test.go
+++ b/adapters/orbidder/orbidder_test.go
@@ -2,6 +2,10 @@ package orbidder
 
 import (
 	"encoding/json"
+	"errors"
+	"github.com/mxmCherry/openrtb/v15/openrtb2"
+	"github.com/prebid/prebid-server/adapters"
+	"github.com/stretchr/testify/mock"
 	"testing"
 
 	"github.com/prebid/prebid-server/adapters/adapterstest"
@@ -22,6 +26,16 @@ func TestUnmarshalOrbidderExtImp(t *testing.T) {
 	}, impExt)
 }
 
+func TestPreprocessExtensions(t *testing.T) {
+	for name, tc := range testCasesExtension {
+		t.Run(name, func(t *testing.T) {
+			imp := tc.imp
+			err := preprocessExtensions(&imp)
+			tc.assertError(t, err)
+		})
+	}
+}
+
 func TestJsonSamples(t *testing.T) {
 	bidder, buildErr := Builder(openrtb_ext.BidderOrbidder, config.Adapter{
 		Endpoint: "https://orbidder-test"})
@@ -32,3 +46,136 @@ func TestJsonSamples(t *testing.T) {
 
 	adapterstest.RunJSONBidderTest(t, "orbiddertest", bidder)
 }
+
+var testCasesCurrency = map[string]struct {
+	imp         openrtb2.Imp
+	setMock     func(m *mock.Mock)
+	expectedImp openrtb2.Imp
+	assertError func(t assert.TestingT, err error, msgAndArgs ...interface{}) bool
+}{
+	"EUR: no bidfloor, no currency": {
+		imp: openrtb2.Imp{
+			BidFloor:    0,
+			BidFloorCur: "",
+		},
+		setMock: func(m *mock.Mock) {},
+		expectedImp: openrtb2.Imp{
+			BidFloor:    0,
+			BidFloorCur: "EUR",
+		},
+		assertError: assert.NoError,
+	},
+	"EUR: bidfloor, no currency": {
+		imp: openrtb2.Imp{
+			BidFloor:    1,
+			BidFloorCur: "",
+		},
+		setMock: func(m *mock.Mock) {},
+		expectedImp: openrtb2.Imp{
+			BidFloor:    1,
+			BidFloorCur: "EUR",
+		},
+		assertError: assert.NoError,
+	},
+	"EUR: bidfloor and currency": {
+		imp: openrtb2.Imp{
+			BidFloor:    1,
+			BidFloorCur: "EUR",
+		},
+		setMock: func(m *mock.Mock) {},
+		expectedImp: openrtb2.Imp{
+			BidFloor:    1,
+			BidFloorCur: "EUR",
+		},
+		assertError: assert.NoError,
+	},
+	"USD: bidfloor with currency": {
+		imp: openrtb2.Imp{
+			BidFloor:    1,
+			BidFloorCur: "USD",
+		},
+		setMock: func(m *mock.Mock) {
+			m.On("GetRate", "USD", "EUR").Return(2.5, nil)
+		},
+		expectedImp: openrtb2.Imp{
+			BidFloor:    2.5,
+			BidFloorCur: "EUR",
+		},
+		assertError: assert.NoError,
+	},
+	"USD: no bidfloor": {
+		imp: openrtb2.Imp{
+			BidFloor:    0,
+			BidFloorCur: "USD",
+		},
+		setMock: func(m *mock.Mock) {},
+		expectedImp: openrtb2.Imp{
+			BidFloor:    0,
+			BidFloorCur: "EUR",
+		},
+		assertError: assert.NoError,
+	},
+	"ABC: invalid currency code": {
+		imp: openrtb2.Imp{
+			BidFloor:    1,
+			BidFloorCur: "ABC",
+		},
+		setMock: func(m *mock.Mock) {
+			m.On("GetRate", "ABC", "EUR").Return(0.0, errors.New("currency conversion error"))
+		},
+		expectedImp: openrtb2.Imp{
+			BidFloor:    1,
+			BidFloorCur: "ABC",
+		},
+		assertError: assert.Error,
+	},
+}
+
+var testCasesExtension = map[string]struct {
+	imp         openrtb2.Imp
+	assertError func(t assert.TestingT, err error, msgAndArgs ...interface{}) bool
+}{
+	"Valid Orbidder Extension": {
+		imp: openrtb2.Imp{
+			Ext: json.RawMessage(`{"bidder":{"accountId":"orbidder-test", "placementId":"center-banner", "bidfloor": 0.1}}`),
+		},
+		assertError: assert.NoError,
+	},
+	"Invalid Orbidder Extension": {
+		imp: openrtb2.Imp{
+			Ext: json.RawMessage(`{"there's'":{"something":"strange", "in the":"neighbourhood", "who you gonna call?": 0.1}}`),
+		},
+		assertError: assert.Error,
+	},
+}
+
+func TestPreprocessBidFloorCurrency(t *testing.T) {
+	for name, tc := range testCasesCurrency {
+		t.Run(name, func(t *testing.T) {
+			imp := tc.imp
+			mockConversions := &mockCurrencyConversion{}
+			tc.setMock(&mockConversions.Mock)
+			extraRequestInfo := adapters.ExtraRequestInfo{
+				CurrencyConversions: mockConversions,
+			}
+			err := preprocessBidFloorCurrency(&imp, &extraRequestInfo)
+			assert.True(t, mockConversions.AssertExpectations(t))
+			tc.assertError(t, err)
+			assert.Equal(t, tc.expectedImp, imp)
+		})
+	}
+}
+
+type mockCurrencyConversion struct {
+	mock.Mock
+}
+
+func (m *mockCurrencyConversion) GetRate(from string, to string) (float64, error) {
+	args := m.Called(from, to)
+	return args.Get(0).(float64), args.Error(1)
+}
+
+func (m *mockCurrencyConversion) GetRates() *map[string]map[string]float64 {
+	args := m.Called()
+	return args.Get(0).(*map[string]map[string]float64)
+}
diff --git a/adapters/orbidder/orbiddertest/exemplary/simple-app-banner.json b/adapters/orbidder/orbiddertest/exemplary/simple-app-banner.json
index 8697bff3a92..2315a52c130 100644
--- a/adapters/orbidder/orbiddertest/exemplary/simple-app-banner.json
+++ b/adapters/orbidder/orbiddertest/exemplary/simple-app-banner.json
@@ -51,6 +51,7 @@
                   }
                 ]
               },
+              "bidfloorcur": "EUR",
               "ext": {
                 "bidder": {
                   "accountId": "orbidder-test",
diff --git a/adapters/orbidder/orbiddertest/supplemental/dsp-bad-request-example.json b/adapters/orbidder/orbiddertest/supplemental/dsp-bad-request-example.json
index 69496c4ff3f..dc199d24ead 100644
--- a/adapters/orbidder/orbiddertest/supplemental/dsp-bad-request-example.json
+++ b/adapters/orbidder/orbiddertest/supplemental/dsp-bad-request-example.json
@@ -51,6 +51,7 @@
                   }
                 ]
               },
+              "bidfloorcur": "EUR",
               "ext": {
                 "bidder": {
                   "accountId": "orbidder-test",
diff --git a/adapters/orbidder/orbiddertest/supplemental/dsp-bad-response-example.json b/adapters/orbidder/orbiddertest/supplemental/dsp-bad-response-example.json
index d1c57a54a9e..61e70d315f7 100644
--- a/adapters/orbidder/orbiddertest/supplemental/dsp-bad-response-example.json
+++ b/adapters/orbidder/orbiddertest/supplemental/dsp-bad-response-example.json
@@ -51,6 +51,7 @@
                   }
                 ]
               },
+              "bidfloorcur": "EUR",
               "ext": {
                 "bidder": {
                   "accountId": "orbidder-test",
diff --git a/adapters/orbidder/orbiddertest/supplemental/dsp-internal-server-error-example.json b/adapters/orbidder/orbiddertest/supplemental/dsp-internal-server-error-example.json
index 20ea36ab38c..66a766a9261 100644
--- a/adapters/orbidder/orbiddertest/supplemental/dsp-internal-server-error-example.json
+++ b/adapters/orbidder/orbiddertest/supplemental/dsp-internal-server-error-example.json
@@ -51,6 +51,7 @@
                   }
                 ]
               },
+              "bidfloorcur": "EUR",
               "ext": {
                 "bidder": {
                   "accountId": "orbidder-test",
diff --git a/adapters/orbidder/orbiddertest/supplemental/dsp-invalid-accountid-example.json b/adapters/orbidder/orbiddertest/supplemental/dsp-invalid-accountid-example.json
index 6bc0482dd0c..7944db44bce 100644
--- a/adapters/orbidder/orbiddertest/supplemental/dsp-invalid-accountid-example.json
+++ b/adapters/orbidder/orbiddertest/supplemental/dsp-invalid-accountid-example.json
@@ -51,6 +51,7 @@
                   }
                 ]
               },
+              "bidfloorcur": "EUR",
               "ext": {
                 "bidder": {
                   "accountId": "orbidder-test",
diff --git a/adapters/orbidder/orbiddertest/supplemental/empty-imp-request-error.json b/adapters/orbidder/orbiddertest/supplemental/empty-imp-request-error.json
deleted file mode 100644
index 0c5cf6d2faa..00000000000
--- a/adapters/orbidder/orbiddertest/supplemental/empty-imp-request-error.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "mockBidRequest": {
-    "id": "test-request-id",
-    "imp": [
-    ],
-    "app": {
-      "bundle": "com.prebid"
-    },
-    "device": {
-      "ifa":"87857b31-8942-4646-ae80-ab9c95bf3fab"
-    }
-  },
-  "expectedMakeRequestsErrors": [
-    {
-      "value": "No impressions in request",
-      "comparison": "literal"
-    }
-  ]
-}
diff --git a/adapters/orbidder/orbiddertest/supplemental/no-content-response.json b/adapters/orbidder/orbiddertest/supplemental/no-content-response.json
index f3b1b287da7..0a1e5f0fc4d 100644
--- a/adapters/orbidder/orbiddertest/supplemental/no-content-response.json
+++ b/adapters/orbidder/orbiddertest/supplemental/no-content-response.json
@@ -51,6 +51,7 @@
                                     }
                                 ]
                             },
+                            "bidfloorcur": "EUR",
                             "ext": {
                                 "bidder": {
                                     "accountId": "orbidder-test",
diff --git a/adapters/orbidder/orbiddertest/supplemental/valid-and-invalid-imps.json b/adapters/orbidder/orbiddertest/supplemental/valid-and-invalid-imps.json
index b6db9f48ee3..1ea133ab1d3 100644
--- a/adapters/orbidder/orbiddertest/supplemental/valid-and-invalid-imps.json
+++ b/adapters/orbidder/orbiddertest/supplemental/valid-and-invalid-imps.json
@@ -57,6 +57,7 @@
                   }
                 ]
               },
+              "bidfloorcur": "EUR",
               "ext": {
                 "bidder": {
                   "accountId": "orbidder-test",
diff --git a/adapters/rubicon/rubicon.go b/adapters/rubicon/rubicon.go
index 72b61628a74..89e4f31d63f 100644
--- a/adapters/rubicon/rubicon.go
+++ b/adapters/rubicon/rubicon.go
@@ -408,9 +408,21 @@ func (a *RubiconAdapter) MakeRequests(request *openrtb2.BidRequest, reqInfo *ada
 			continue
 		}
 
+		siteId, err := rubiconExt.SiteId.Int64()
+		if err != nil {
+			errs = append(errs, err)
+			continue
+		}
+
+		zoneId, err := rubiconExt.ZoneId.Int64()
+		if err != nil {
+			errs = append(errs, err)
+			continue
+		}
+
 		impExt := rubiconImpExt{
 			RP: rubiconImpExtRP{
-				ZoneID: rubiconExt.ZoneId,
+				ZoneID: int(zoneId),
 				Target: target,
 				Track:  rubiconImpExtRPTrack{Mint: "", MintVersion: ""},
 			},
@@ -534,11 +546,17 @@ func (a *RubiconAdapter) MakeRequests(request *openrtb2.BidRequest, reqInfo *ada
 			imp.Video = nil
 		}
 
-		pubExt := rubiconPubExt{RP: rubiconPubExtRP{AccountID: rubiconExt.AccountId}}
+		accountId, err := rubiconExt.AccountId.Int64()
+		if err != nil {
+			errs = append(errs, err)
+			continue
+		}
+
+		pubExt := rubiconPubExt{RP: rubiconPubExtRP{AccountID: int(accountId)}}
 
 		if request.Site != nil {
 			siteCopy := *request.Site
-			siteExtRP := rubiconSiteExt{RP: rubiconSiteExtRP{SiteID: rubiconExt.SiteId}}
+			siteExtRP := rubiconSiteExt{RP: rubiconSiteExtRP{SiteID: int(siteId)}}
 			if siteCopy.Content != nil {
 				siteTarget := make(map[string]interface{})
 				updateExtWithIabAttribute(siteTarget, siteCopy.Content.Data, []int{1, 2, 5, 6})
@@ -563,7 +581,7 @@ func (a *RubiconAdapter) MakeRequests(request *openrtb2.BidRequest, reqInfo *ada
 			rubiconRequest.Site = &siteCopy
 		} else {
 			appCopy := *request.App
-			appCopy.Ext, err = json.Marshal(rubiconSiteExt{RP: rubiconSiteExtRP{SiteID: rubiconExt.SiteId}})
+			appCopy.Ext, err = json.Marshal(rubiconSiteExt{RP: rubiconSiteExtRP{SiteID: int(siteId)}})
 			appCopy.Publisher = &openrtb2.Publisher{}
 			appCopy.Publisher.Ext, err = json.Marshal(&pubExt)
 			rubiconRequest.App = &appCopy
diff --git a/adapters/rubicon/rubicon_test.go b/adapters/rubicon/rubicon_test.go
index 83c9e99a216..e847b4fe0a4 100644
--- a/adapters/rubicon/rubicon_test.go
+++ b/adapters/rubicon/rubicon_test.go
@@ -942,7 +942,10 @@ func TestOpenRTBRequestWithVideoImpAndEnabledRewardedInventoryFlag(t *testing.T)
 				"is_rewarded_inventory": 1
 			},
 			"bidder": {
-				"video": {"size_id": 1}
+				"video": {"size_id": 1},
+				"zoneId": "123",
+				"siteId": 1234,
+				"accountId": "444"
 			}}`),
 		}},
 		App: &openrtb2.App{
diff --git a/adapters/rubicon/rubicontest/exemplary/flexible-schema.json b/adapters/rubicon/rubicontest/exemplary/flexible-schema.json
new file mode 100644
index 00000000000..5883c635ff2
--- /dev/null
+++ b/adapters/rubicon/rubicontest/exemplary/flexible-schema.json
@@ -0,0 +1,419 @@
+{
+  "mockBidRequest": {
+    "id": "test-request-id",
+    "device": {
+      "ip": "123.123.123.123",
+      "ifa": "zxcjbzxmc-zxcbmz-zxbcz-zxczx"
+    },
+    "app": {
+      "pagecat": [
+        "val1",
+        "val2"
+      ],
+      "sectioncat": [
+        "sectionCat1",
+        "sectionCat2"
+      ],
+      "ext": {
+        "data": {
+          "attr1": "val1",
+          "attr2": [
+            "val21",
+            "val22"
+          ],
+          "attr3": true,
+          "attr4": [
+            true,
+            false,
+            true,
+            true
+          ],
+          "attr5": 3,
+          "attr6": [
+            1,
+            2,
+            3
+          ],
+          "attr7": 1.23
+        }
+      }
+    },
+    "user": {
+      "yob": 2000,
+      "geo": {
+        "country": "USA",
+        "lat": 47.627500,
+        "lon": -122.346200
+      },
+      "gender": "f",
+      "data": [
+        {
+          "ext": {
+            "segtax": 4
+          },
+          "segment": [
+            {
+              "id": "idToCopy"
+            }
+          ]
+        },
+        {
+          "ext": {
+            "segtax": "someValue"
+          },
+          "segment": [
+            {
+              "id": "shouldNotBeCopied"
+            }
+          ]
+        },
+        {
+          "ext": {
+            "segtax": "4"
+          },
+          "segment": [
+            {
+              "id": "shouldNotBeCopied2"
+            }
+          ]
+        },
+        {
+          "ext": {
+            "segtax": 4
+          },
+          "segment": [
+            {
+              "id": "idToCopy2"
+            }
+          ]
+        },
+        {
+          "ext": {
+            "segtax": [
+              4
+            ]
+          },
+          "segment": [
+            {
+              "id": "shouldNotBeCopied3"
+            }
+          ]
+        }
+      ],
+      "ext": {
+        "data": {
+          "attr1": "val1",
+          "attr2": [
+            "val21",
+            "val22"
+          ],
+          "attr3": true,
+          "attr4": [
+            true,
+            false,
+            true,
+            true
+          ],
+          "attr5": 3,
+          "attr6": [
+            1,
+            2,
+            3
+          ],
+          "attr7": 1.23
+        }
+      }
+    },
+    "imp": [
+      {
+        "id": "test-imp-id",
+        "instl": 1,
+        "video": {
+          "placement": 3,
+          "mimes": [
+            "video/mp4"
+          ],
+          "protocols": [
+            2,
+            5
+          ],
+          "w": 1024,
+          "h": 576
+        },
+        "ext": {
+          "context": {
+            "data": {
+              "adserver": {
+                "name": "gam",
+                "adslot": "adSlotFromContextData"
+              },
+              "dataAttr1": "dataVal1",
+              "dataAttr2": "dataVal2"
+            }
+          },
+          "data": {
+            "adserver": {
+              "name": "gam",
+              "adslot": "adSlotFromData"
+            }
+          },
+          "bidder": {
+            "video": {
+            },
+            "accountId": "1001",
+            "siteId": "113932",
+            "zoneId": "535510"
+          },
+          "gpid": "gpid"
+        }
+      }
+    ]
+  },
+  "httpCalls": [
+    {
+      "expectedRequest": {
+        "uri": "uri?tk_xint=pbs-test-tracker",
+        "body": {
+          "id": "test-request-id",
+          "device": {
+            "ext": {
+              "rp": {
+                "pixelratio": 0
+              }
+            },
+            "ip": "123.123.123.123",
+            "ifa": "zxcjbzxmc-zxcbmz-zxbcz-zxczx"
+          },
+          "app": {
+            "pagecat": [
+              "val1",
+              "val2"
+            ],
+            "sectioncat": [
+              "sectionCat1",
+              "sectionCat2"
+            ],
+            "ext": {
+              "rp": {
+                "site_id": 113932
+              }
+            },
+            "publisher": {
+              "ext": {
+                "rp": {
+                  "account_id": 1001
+                }
+              }
+            }
+          },
+          "user": {
+            "data": [
+              {
+                "ext": {
+                  "segtax": 4
+                },
+                "segment": [
+                  {
+                    "id": "idToCopy"
+                  }
+                ]
+              },
+              {
+                "ext": {
+                  "segtax": "someValue"
+                },
+                "segment": [
+                  {
+                    "id": "shouldNotBeCopied"
+                  }
+                ]
+              },
+              {
+                "ext": {
+                  "segtax": "4"
+                },
+                "segment": [
+                  {
+                    "id": "shouldNotBeCopied2"
+                  }
+                ]
+              },
+              {
+                "ext": {
+                  "segtax": 4
+                },
+                "segment": [
+                  {
+                    "id": "idToCopy2"
+                  }
+                ]
+              },
+              {
+                "ext": {
+                  "segtax": [
+                    4
+                  ]
+                },
+                "segment": [
+                  {
+                    "id": "shouldNotBeCopied3"
+                  }
+                ]
+              }
+            ],
+            "ext": {
+              "rp": {
+                "target": {
+                  "attr1": [
+                    "val1"
+                  ],
+                  "attr2": [
+                    "val21",
+                    "val22"
+                  ],
+                  "attr3": [
+                    "true"
+                  ],
+                  "attr4": [
+                    "true",
+                    "false",
+                    "true",
+                    "true"
+                  ],
+                  "attr5": [
+                    "3"
+                  ],
+                  "iab": [
+                    "idToCopy",
+                    "idToCopy2"
+                  ]
+                }
+              }
+            }
+          },
+          "imp": [
+            {
+              "id": "test-imp-id",
+              "instl": 1,
+              "video": {
+                "placement": 3,
+                "ext": {
+                  "rp": {
+                    "size_id": 203
+                  }
+                },
+                "mimes": [
+                  "video/mp4"
+                ],
+                "protocols": [
+                  2,
+                  5
+                ],
+                "w": 1024,
+                "h": 576
+              },
+              "ext": {
+                "rp": {
+                  "target": {
+                    "dfp_ad_unit_code": "adSlotFromContextData",
+                    "dataAttr1": [
+                      "dataVal1"
+                    ],
+                    "dataAttr2": [
+                      "dataVal2"
+                    ],
+                    "attr1": [
+                      "val1"
+                    ],
+                    "attr2": [
+                      "val21",
+                      "val22"
+                    ],
+                    "attr3": [
+                      "true"
+                    ],
+                    "attr4": [
+                      "true",
+                      "false",
+                      "true",
+                      "true"
+                    ],
+                    "attr5": [
+                      "3"
+                    ],
+                    "pagecat": [
+                      "val1",
+                      "val2"
+                    ],
+                    "sectioncat": [
+                      "sectionCat1",
+                      "sectionCat2"
+                    ]
+                  },
+                  "track": {
+                    "mint": "",
+                    "mint_version": ""
+                  },
+                  "zone_id": 535510
+                },
+                "gpid": "gpid"
+              }
+            }
+          ]
+        }
+      },
+      "mockResponse": {
+        "status": 200,
+        "body": {
+          "id": "test-request-id",
+          "seatbid": [
+            {
+              "bid": [
+                {
+                  "id": "test_bid_id",
+                  "impid": "test-imp-id",
+                  "price": 0.27543,
+                  "adm": "some-test-ad",
+                  "cid": "test_cid",
+                  "crid": "test_crid",
+                  "dealid": "test_dealid",
+                  "ext": {
+                    "prebid": {
+                      "type": "video"
+                    }
+                  }
+                }
+              ],
+              "seat": "adman"
+            }
+          ],
+          "cur": "USD"
+        }
+      }
+    }
+  ],
+  "expectedBidResponses": [
+    {
+      "currency": "USD",
+      "bids": [
+        {
+          "bid": {
+            "id": "test_bid_id",
+            "impid": "test-imp-id",
+            "price": 0.27543,
+            "adm": "some-test-ad",
+            "cid": "test_cid",
+            "crid": "test_crid",
+            "dealid": "test_dealid",
+            "ext": {
+              "prebid": {
+                "type": "video"
+              }
+            }
+          },
+          "type": "video"
+        }
+      ]
+    }
+  ]
+}
diff --git a/adapters/valueimpression/valueimpression.go b/adapters/valueimpression/valueimpression.go
deleted file mode 100644
index aac8faab52c..00000000000
--- a/adapters/valueimpression/valueimpression.go
+++ /dev/null
@@ -1,157 +0,0 @@
-package valueimpression
-
-import (
-	"encoding/json"
-	"fmt"
-	"net/http"
-
-	"github.com/mxmCherry/openrtb/v15/openrtb2"
-	"github.com/prebid/prebid-server/adapters"
-	"github.com/prebid/prebid-server/config"
-	"github.com/prebid/prebid-server/errortypes"
-	"github.com/prebid/prebid-server/openrtb_ext"
-)
-
-type ValueImpressionAdapter struct {
-	endpoint string
-}
-
-func (a *ValueImpressionAdapter) MakeRequests(request *openrtb2.BidRequest, unused *adapters.ExtraRequestInfo) ([]*adapters.RequestData, []error) {
-	var errs []error
-	var adapterRequests []*adapters.RequestData
-
-	if err := preprocess(request); err != nil {
-		errs = append(errs, err)
-		return nil, errs
-	}
-
-	adapterReq, err := a.makeRequest(request)
-	if err != nil {
-		errs = append(errs, err)
-		return nil, errs
-	}
-
-	adapterRequests = append(adapterRequests, adapterReq)
-
-	return adapterRequests, errs
-}
-
-func (a *ValueImpressionAdapter) makeRequest(request *openrtb2.BidRequest) (*adapters.RequestData, error) {
-	var err error
-
-	jsonBody, err := json.Marshal(request)
-	if err != nil {
-		return nil, err
-	}
-
-	headers := http.Header{}
-	headers.Add("Content-Type", "application/json;charset=utf-8")
-
-	return &adapters.RequestData{
-		Method:  "POST",
-		Uri:     a.endpoint,
-		Body:    jsonBody,
-		Headers: headers,
-	}, nil
-}
-
-func preprocess(request *openrtb2.BidRequest) error {
-	if len(request.Imp) == 0 {
-		return &errortypes.BadInput{
-			Message: "No Imps in Bid Request",
-		}
-	}
-	for i := 0; i < len(request.Imp); i++ {
-		var imp = &request.Imp[i]
-		var bidderExt adapters.ExtImpBidder
-
-		if err := json.Unmarshal(imp.Ext, &bidderExt); err != nil {
-			return &errortypes.BadInput{
-				Message: err.Error(),
-			}
-		}
-
-		var extImp openrtb_ext.ExtImpValueImpression
-		if err := json.Unmarshal(bidderExt.Bidder, &extImp); err != nil {
-			return &errortypes.BadInput{
-				Message: err.Error(),
-			}
-		}
-
-		imp.Ext = bidderExt.Bidder
-	}
-
-	return nil
-}
-
-// MakeBids based on valueimpression server response
-func (a *ValueImpressionAdapter) MakeBids(bidRequest *openrtb2.BidRequest, unused *adapters.RequestData, responseData *adapters.ResponseData) (*adapters.BidderResponse, []error) {
-	if responseData.StatusCode == http.StatusNoContent {
-		return nil, nil
-	}
-
-	if responseData.StatusCode == http.StatusBadRequest {
-		return nil, []error{&errortypes.BadInput{
-			Message: fmt.Sprintf("Bad user input: HTTP status %d", responseData.StatusCode),
-		}}
-	}
-
-	if responseData.StatusCode != http.StatusOK {
-		return nil, []error{&errortypes.BadServerResponse{
-			Message: fmt.Sprintf("Bad server response: HTTP status %d", responseData.StatusCode),
-		}}
-	}
-
-	var bidResponse openrtb2.BidResponse
-
-	if err := json.Unmarshal(responseData.Body, &bidResponse); err != nil {
-		return nil, []error{&errortypes.BadServerResponse{
-			Message: err.Error(),
-		}}
-	}
-
-	if len(bidResponse.SeatBid) == 0 {
-		return nil, nil
-	}
-
-	rv := adapters.NewBidderResponseWithBidsCapacity(len(bidResponse.SeatBid[0].Bid))
-	var errors []error
-
-	for _, seatbid := range bidResponse.SeatBid {
-		for _, bid := range seatbid.Bid {
-			foundMatchingBid := false
-			bidType := openrtb_ext.BidTypeBanner
-			for _, imp := range bidRequest.Imp {
-				if imp.ID == bid.ImpID {
-					foundMatchingBid = true
-					if imp.Banner != nil {
-						bidType = openrtb_ext.BidTypeBanner
-					} else if imp.Video != nil {
-						bidType = openrtb_ext.BidTypeVideo
-					}
-					break
-				}
-			}
-
-			if foundMatchingBid {
-				rv.Bids = append(rv.Bids, &adapters.TypedBid{
-					Bid:     &bid,
-					BidType: bidType,
-				})
-			} else {
-				errors = append(errors, &errortypes.BadServerResponse{
-					Message: fmt.Sprintf("bid id='%s' could not find valid impid='%s'", bid.ID, bid.ImpID),
-				})
-			}
-		}
-	}
-	return rv, errors
-}
-
-// Builder builds a new instance of the Valueimpression adapter for the given bidder with the given config.
-func Builder(bidderName openrtb_ext.BidderName, config config.Adapter) (adapters.Bidder, error) {
-	bidder := &ValueImpressionAdapter{
-		endpoint: config.Endpoint,
-	}
-	return bidder, nil
-}
diff --git a/config/config.go b/config/config.go
index f9dbc274ec1..a2413ffe64b 100644
--- a/config/config.go
+++ b/config/config.go
@@ -45,7 +45,8 @@ type Configuration struct {
 	Accounts          StoredRequests  `mapstructure:"accounts"`
 	UserSync          UserSync        `mapstructure:"user_sync"`
 	// Note that StoredVideo refers to stored video requests, and has nothing to do with caching video creatives.
-	StoredVideo StoredRequests `mapstructure:"stored_video_req"`
+	StoredVideo     StoredRequests `mapstructure:"stored_video_req"`
+	StoredResponses StoredRequests `mapstructure:"stored_responses"`
 
 	// Adapters should have a key for every openrtb_ext.BidderName, converted to lower-case.
 	// Se also: https://github.com/spf13/viper/issues/371#issuecomment-335388559
@@ -287,7 +288,7 @@ type TCF2 struct {
 	Purpose8            TCF2Purpose             `mapstructure:"purpose8"`
 	Purpose9            TCF2Purpose             `mapstructure:"purpose9"`
 	Purpose10           TCF2Purpose             `mapstructure:"purpose10"`
-	SpecialPurpose1     TCF2Purpose             `mapstructure:"special_purpose1"`
+	SpecialFeature1     TCF2SpecialFeature      `mapstructure:"special_feature1"`
 	PurposeOneTreatment TCF2PurposeOneTreatment `mapstructure:"purpose_one_treatment"`
 }
 
@@ -301,6 +302,13 @@ type TCF2Purpose struct {
 	VendorExceptionMap map[openrtb_ext.BidderName]struct{}
 }
 
+type TCF2SpecialFeature struct {
+	Enforce bool `mapstructure:"enforce"`
+	// Array of vendor exceptions that is used to create the hash table VendorExceptionMap so vendor names can be instantly accessed
+	VendorExceptions   []openrtb_ext.BidderName `mapstructure:"vendor_exceptions"`
+	VendorExceptionMap map[openrtb_ext.BidderName]struct{}
+}
+
 type TCF2PurposeOneTreatment struct {
 	Enabled       bool `mapstructure:"enabled"`
 	AccessAllowed bool `mapstructure:"access_allowed"`
@@ -556,7 +564,6 @@ func New(v *viper.Viper) (*Configuration, error) {
 		&c.GDPR.TCF2.Purpose8,
 		&c.GDPR.TCF2.Purpose9,
 		&c.GDPR.TCF2.Purpose10,
-		&c.GDPR.TCF2.SpecialPurpose1,
 	}
 	for c := 0; c < len(purposeConfigs); c++ {
 		purposeConfigs[c].VendorExceptionMap = make(map[openrtb_ext.BidderName]struct{})
@@ -567,6 +574,14 @@ func New(v *viper.Viper) (*Configuration, error) {
 		}
 	}
 
+	// To look for a special feature's vendor exceptions in O(1) time, we fill this hash table with bidders located in the
+	// VendorExceptions field of the GDPR.TCF2.SpecialFeature1 struct defined in this file
+	c.GDPR.TCF2.SpecialFeature1.VendorExceptionMap = make(map[openrtb_ext.BidderName]struct{})
+	for v := 0; v < len(c.GDPR.TCF2.SpecialFeature1.VendorExceptions); v++ {
+		bidderName := c.GDPR.TCF2.SpecialFeature1.VendorExceptions[v]
+		c.GDPR.TCF2.SpecialFeature1.VendorExceptionMap[bidderName] = struct{}{}
+	}
+
 	// To look for a request's app_id in O(1) time, we fill this hash table located in the
 	// the BlacklistedApps field of the Configuration struct defined in this file
 	c.BlacklistedAppMap = make(map[string]bool)
@@ -710,6 +725,7 @@ func SetupViper(v *viper.Viper, filename string) {
 	v.SetDefault("stored_requests.in_memory_cache.ttl_seconds", 0)
 	v.SetDefault("stored_requests.in_memory_cache.request_cache_size_bytes", 0)
 	v.SetDefault("stored_requests.in_memory_cache.imp_cache_size_bytes", 0)
+	v.SetDefault("stored_requests.in_memory_cache.resp_cache_size_bytes", 0)
 	v.SetDefault("stored_requests.cache_events_api", false)
 	v.SetDefault("stored_requests.http_events.endpoint", "")
 	v.SetDefault("stored_requests.http_events.amp_endpoint", "")
@@ -735,11 +751,36 @@ func SetupViper(v *viper.Viper, filename string) {
 	v.SetDefault("stored_video_req.in_memory_cache.ttl_seconds", 0)
 	v.SetDefault("stored_video_req.in_memory_cache.request_cache_size_bytes", 0)
 	v.SetDefault("stored_video_req.in_memory_cache.imp_cache_size_bytes", 0)
+	v.SetDefault("stored_video_req.in_memory_cache.resp_cache_size_bytes", 0)
 	v.SetDefault("stored_video_req.cache_events.enabled", false)
 	v.SetDefault("stored_video_req.cache_events.endpoint", "")
 	v.SetDefault("stored_video_req.http_events.endpoint", "")
 	v.SetDefault("stored_video_req.http_events.refresh_rate_seconds", 0)
 	v.SetDefault("stored_video_req.http_events.timeout_ms", 0)
+	v.SetDefault("stored_responses.filesystem.enabled", false)
+	v.SetDefault("stored_responses.filesystem.directorypath", "")
+	v.SetDefault("stored_responses.postgres.connection.dbname", "")
+	v.SetDefault("stored_responses.postgres.connection.host", "")
+	v.SetDefault("stored_responses.postgres.connection.port", 0)
+	v.SetDefault("stored_responses.postgres.connection.user", "")
+	v.SetDefault("stored_responses.postgres.connection.password", "")
+	v.SetDefault("stored_responses.postgres.fetcher.query", "")
+	v.SetDefault("stored_responses.postgres.initialize_caches.timeout_ms", 0)
+	v.SetDefault("stored_responses.postgres.initialize_caches.query", "")
+	v.SetDefault("stored_responses.postgres.poll_for_updates.refresh_rate_seconds", 0)
+	v.SetDefault("stored_responses.postgres.poll_for_updates.timeout_ms", 0)
+	v.SetDefault("stored_responses.postgres.poll_for_updates.query", "")
+	v.SetDefault("stored_responses.http.endpoint", "")
+	v.SetDefault("stored_responses.in_memory_cache.type", "none")
+	v.SetDefault("stored_responses.in_memory_cache.ttl_seconds", 0)
+	v.SetDefault("stored_responses.in_memory_cache.request_cache_size_bytes", 0)
+	v.SetDefault("stored_responses.in_memory_cache.imp_cache_size_bytes", 0)
+	v.SetDefault("stored_responses.in_memory_cache.resp_cache_size_bytes", 0)
+	v.SetDefault("stored_responses.cache_events.enabled", false)
+	v.SetDefault("stored_responses.cache_events.endpoint", "")
+	v.SetDefault("stored_responses.http_events.endpoint", "")
+	v.SetDefault("stored_responses.http_events.refresh_rate_seconds", 0)
+	v.SetDefault("stored_responses.http_events.timeout_ms", 0)
 
 	v.SetDefault("vtrack.timeout_ms", 2000)
 	v.SetDefault("vtrack.allow_unknown_bidder", true)
@@ -790,6 +831,7 @@ func SetupViper(v *viper.Viper, filename string) {
 	v.SetDefault("adapters.aja.endpoint", "https://ad.as.amanad.adtdp.com/v1/bid/4")
 	v.SetDefault("adapters.algorix.endpoint", "https://{{.Host}}.svr-algorix.com/rtb/sa?sid={{.SourceId}}&token={{.AccountID}}")
 	v.SetDefault("adapters.amx.endpoint", "http://pbs.amxrtb.com/auction/openrtb")
+	v.SetDefault("adapters.apacdex.endpoint", "http://useast.quantumdex.io/auction/pbs")
 	v.SetDefault("adapters.applogy.endpoint", "http://rtb.applogy.com/v1/prebid")
 	v.SetDefault("adapters.appnexus.endpoint", "http://ib.adnxs.com/openrtb2") // Docs: https://wiki.appnexus.com/display/supply/Incoming+Bid+Request+from+SSPs
 	v.SetDefault("adapters.appnexus.platform_id", "5")
@@ -809,6 +851,7 @@ func SetupViper(v *viper.Viper, filename string) {
 	v.SetDefault("adapters.brightroll.endpoint", "http://east-bid.ybp.yahoo.com/bid/appnexuspbs")
 	v.SetDefault("adapters.coinzilla.endpoint", "http://request-global.czilladx.com/serve/prebid-server.php")
 	v.SetDefault("adapters.colossus.endpoint", "http://colossusssp.com/?c=o&m=rtb")
+	v.SetDefault("adapters.compass.endpoint", "http://sa-lb.deliverimp.com/pserver")
 	v.SetDefault("adapters.connectad.endpoint", "http://bidder.connectad.io/API?src=pbs")
 	v.SetDefault("adapters.consumable.endpoint", "https://e.serverbid.com/api/v2")
 	v.SetDefault("adapters.conversant.endpoint", "http://api.hb.ad.cpe.dotomi.com/cvx/server/hb/ortb/25")
@@ -867,6 +910,7 @@ func SetupViper(v *viper.Viper, filename string) {
 	v.SetDefault("adapters.pubmatic.endpoint", "https://hbopenbid.pubmatic.com/translator?source=prebid-server")
 	v.SetDefault("adapters.pubnative.endpoint", "http://dsp.pubnative.net/bid/v1/request")
 	v.SetDefault("adapters.pulsepoint.endpoint", "http://bid.contextweb.com/header/s/ortb/prebid-s2s")
+	v.SetDefault("adapters.quantumdex.endpoint", "http://useast.quantumdex.io/auction/pbs")
 	v.SetDefault("adapters.revcontent.disabled", true)
 	v.SetDefault("adapters.revcontent.endpoint", "https://trends.revcontent.com/rtb")
 	v.SetDefault("adapters.rhythmone.endpoint", "http://tag.1rx.io/rmp")
@@ -896,7 +940,7 @@ func SetupViper(v *viper.Viper, filename string) {
 	v.SetDefault("adapters.ucfunnel.endpoint", "https://pbs.aralego.com/prebid")
 	v.SetDefault("adapters.unicorn.endpoint", "https://ds.uncn.jp/pb/0/bid.json")
 	v.SetDefault("adapters.unruly.endpoint", "https://targeting.unrulymedia.com/unruly_prebid_server")
-	v.SetDefault("adapters.valueimpression.endpoint", "https://rtb.valueimpression.com/endpoint")
+	v.SetDefault("adapters.valueimpression.endpoint", "http://useast.quantumdex.io/auction/pbs")
 	v.SetDefault("adapters.verizonmedia.disabled", true)
 	v.SetDefault("adapters.videobyte.endpoint", "https://x.videobyte.com/ortbhb")
 	v.SetDefault("adapters.viewdeos.endpoint", "http://ghb.sync.viewdeos.com/pbs/ortb")
@@ -947,8 +991,6 @@ func SetupViper(v *viper.Viper, filename string) {
 	v.SetDefault("gdpr.tcf2.purpose8.vendor_exceptions", []openrtb_ext.BidderName{})
 	v.SetDefault("gdpr.tcf2.purpose9.vendor_exceptions", []openrtb_ext.BidderName{})
 	v.SetDefault("gdpr.tcf2.purpose10.vendor_exceptions", []openrtb_ext.BidderName{})
-	v.SetDefault("gdpr.tcf2.special_purpose1.enabled", true)
-	v.SetDefault("gdpr.tcf2.special_purpose1.vendor_exceptions", []openrtb_ext.BidderName{})
 	v.SetDefault("gdpr.amp_exception", false)
 	v.SetDefault("gdpr.eea_countries", []string{"ALA", "AUT", "BEL", "BGR", "HRV", "CYP", "CZE", "DNK", "EST",
 		"FIN", "FRA", "GUF", "DEU", "GIB", "GRC", "GLP", "GGY", "HUN", "ISL", "IRL", "IMN", "ITA", "JEY", "LVA",
@@ -1005,6 +1047,7 @@ func SetupViper(v *viper.Viper, filename string) {
 	// Migrate config settings to maintain compatibility with old configs
 	migrateConfig(v)
 	migrateConfigPurposeOneTreatment(v)
+	migrateConfigSpecialFeature1(v)
 	migrateConfigTCF2PurposeEnabledFlags(v)
 
 	// These defaults must be set after the migrate functions because those functions look for the presence of these
@@ -1032,6 +1075,8 @@ func SetupViper(v *viper.Viper, filename string) {
 	v.SetDefault("gdpr.tcf2.purpose10.enforce_purpose", TCF2FullEnforcement)
 	v.SetDefault("gdpr.tcf2.purpose_one_treatment.enabled", true)
 	v.SetDefault("gdpr.tcf2.purpose_one_treatment.access_allowed", true)
+	v.SetDefault("gdpr.tcf2.special_feature1.enforce", true)
+	v.SetDefault("gdpr.tcf2.special_feature1.vendor_exceptions", []openrtb_ext.BidderName{})
 }
 
 func migrateConfig(v *viper.Viper) {
@@ -1059,6 +1104,19 @@ func migrateConfigPurposeOneTreatment(v *viper.Viper) {
 	}
 }
 
+func migrateConfigSpecialFeature1(v *viper.Viper) {
+	if oldConfig, ok := v.Get("gdpr.tcf2.special_purpose1").(map[string]interface{}); ok {
+		if v.IsSet("gdpr.tcf2.special_feature1") {
+			glog.Warning("using gdpr.tcf2.special_feature1 and ignoring deprecated gdpr.tcf2.special_purpose1")
+		} else {
+			glog.Warning("gdpr.tcf2.special_purpose1.enabled is deprecated and should be changed to gdpr.tcf2.special_feature1.enforce")
+			glog.Warning("gdpr.tcf2.special_purpose1.vendor_exceptions is deprecated and should be changed to gdpr.tcf2.special_feature1.vendor_exceptions")
+			v.Set("gdpr.tcf2.special_feature1.enforce", oldConfig["enabled"])
+			v.Set("gdpr.tcf2.special_feature1.vendor_exceptions", oldConfig["vendor_exceptions"])
+		}
+	}
+}
+
 func migrateConfigTCF2PurposeEnabledFlags(v *viper.Viper) {
 	for i := 1; i <= 10; i++ {
 		oldField := fmt.Sprintf("gdpr.tcf2.purpose%d.enabled", i)
diff --git a/config/config_test.go b/config/config_test.go
index f86f13bda7c..766244c4de6 100644
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -217,8 +217,8 @@ func TestDefaults(t *testing.T) {
 			VendorExceptions:   []openrtb_ext.BidderName{},
 			VendorExceptionMap: map[openrtb_ext.BidderName]struct{}{},
 		},
-		SpecialPurpose1: TCF2Purpose{
-			Enabled:            true,
+		SpecialFeature1: TCF2SpecialFeature{
+			Enforce:            true,
 			VendorExceptions:   []openrtb_ext.BidderName{},
 			VendorExceptionMap: map[openrtb_ext.BidderName]struct{}{},
 		},
@@ -272,7 +272,7 @@ gdpr:
     purpose10:
       enforce_vendors: false
       vendor_exceptions: ["foo10"]
-    special_purpose1:
+    special_feature1:
       vendor_exceptions: ["fooSP1"]
 ccpa:
   enforce: true
@@ -540,8 +540,8 @@ func TestFullConfig(t *testing.T) {
 			VendorExceptions:   []openrtb_ext.BidderName{openrtb_ext.BidderName("foo10")},
 			VendorExceptionMap: map[openrtb_ext.BidderName]struct{}{openrtb_ext.BidderName("foo10"): {}},
 		},
-		SpecialPurpose1: TCF2Purpose{
-			Enabled:            true, // true by default
+		SpecialFeature1: TCF2SpecialFeature{
+			Enforce:            true, // true by default
 			VendorExceptions:   []openrtb_ext.BidderName{openrtb_ext.BidderName("fooSP1")},
 			VendorExceptionMap: map[openrtb_ext.BidderName]struct{}{openrtb_ext.BidderName("fooSP1"): {}},
 		},
@@ -765,6 +765,91 @@ func TestMigrateConfigPurposeOneTreatment(t *testing.T) {
 	}
 }
 
+func TestMigrateConfigSpecialFeature1(t *testing.T) {
+	oldSpecialFeature1Config := []byte(`
+      gdpr:
+        tcf2:
+          special_purpose1:
+            enabled: true
+            vendor_exceptions: ["appnexus"]
+    `)
+	newSpecialFeature1Config := []byte(`
+      gdpr:
+        tcf2:
+          special_feature1:
+            enforce: true
+            vendor_exceptions: ["appnexus"]
+    `)
+	oldAndNewSpecialFeature1Config := []byte(`
+      gdpr:
+        tcf2:
+          special_purpose1:
+            enabled: false
+            vendor_exceptions: ["appnexus"]
+          special_feature1:
+            enforce: true
+            vendor_exceptions: ["rubicon"]
+    `)
+
+	tests := []struct {
+		description                         string
+		config                              []byte
+		wantSpecialFeature1Enforce          bool
+		wantSpecialFeature1VendorExceptions []string
+	}{
+		{
+			description: "New config and old config not set",
+			config:      []byte{},
+		},
+		{
+			description:                         "New config not set, old config set",
+			config:                              oldSpecialFeature1Config,
+			wantSpecialFeature1Enforce:          true,
+			wantSpecialFeature1VendorExceptions: []string{"appnexus"},
+		},
+		{
+			description:                         "New config set, old config not set",
+			config:                              newSpecialFeature1Config,
+			wantSpecialFeature1Enforce:          true,
+			wantSpecialFeature1VendorExceptions: []string{"appnexus"},
+		},
+		{
+			description:                         "New config and old config set",
+			config:                              oldAndNewSpecialFeature1Config,
+			wantSpecialFeature1Enforce:          true,
+			wantSpecialFeature1VendorExceptions: []string{"rubicon"},
+		},
+	}
+
+	for _, tt := range tests {
+		v := viper.New()
+		v.SetConfigType("yaml")
+		v.ReadConfig(bytes.NewBuffer(tt.config))
+
+		migrateConfigSpecialFeature1(v)
+
+		if len(tt.config) > 0 {
+			assert.Equal(t, tt.wantSpecialFeature1Enforce, v.Get("gdpr.tcf2.special_feature1.enforce").(bool), tt.description)
+			assert.Equal(t, tt.wantSpecialFeature1VendorExceptions, v.GetStringSlice("gdpr.tcf2.special_feature1.vendor_exceptions"), tt.description)
+		} else {
+			assert.Nil(t, v.Get("gdpr.tcf2.special_feature1.enforce"), tt.description)
+			assert.Nil(t, v.Get("gdpr.tcf2.special_feature1.vendor_exceptions"), tt.description)
+		}
+
+		var c Configuration
+		err := v.Unmarshal(&c)
+		assert.NoError(t, err, tt.description)
+		assert.Equal(t, tt.wantSpecialFeature1Enforce, c.GDPR.TCF2.SpecialFeature1.Enforce, tt.description)
+
+		// convert expected vendor exceptions to type BidderName
+		expectedVendorExceptions := make([]openrtb_ext.BidderName, 0, 0)
+		for _, ve := range tt.wantSpecialFeature1VendorExceptions {
+			expectedVendorExceptions = append(expectedVendorExceptions, openrtb_ext.BidderName(ve))
+		}
+		assert.ElementsMatch(t, expectedVendorExceptions, c.GDPR.TCF2.SpecialFeature1.VendorExceptions, tt.description)
+	}
+}
+
 func TestMigrateConfigTCF2PurposeEnabledFlags(t *testing.T) {
 	trueStr := "true"
 	falseStr := "false"
@@ -1291,3 +1376,58 @@ func doTimeoutTest(t *testing.T, expected int, requested int, max uint64, def ui
 	limited := cfg.LimitAuctionTimeout(time.Duration(requested) * time.Millisecond)
 	assert.Equal(t, limited, expectedDuration, "Expected %dms timeout, got %dms", expectedDuration, limited/time.Millisecond)
 }
+
+func TestSpecialFeature1VendorExceptionMap(t *testing.T) {
+	baseConfig := []byte(`
+    gdpr:
+      default_value: 0
+      tcf2:
+        special_feature1:
+          vendor_exceptions: `)
+
+	tests := []struct {
+		description             string
+		configVendorExceptions  []byte
+		wantVendorExceptions    []openrtb_ext.BidderName
+		wantVendorExceptionsMap map[openrtb_ext.BidderName]struct{}
+	}{
+		{
+			description:             "nil vendor exceptions",
+			configVendorExceptions:  []byte(`null`),
+			wantVendorExceptions:    []openrtb_ext.BidderName{},
+			wantVendorExceptionsMap: map[openrtb_ext.BidderName]struct{}{},
+		},
+		{
+			description:             "no vendor exceptions",
+			configVendorExceptions:  []byte(`[]`),
+			wantVendorExceptions:    []openrtb_ext.BidderName{},
+			wantVendorExceptionsMap: map[openrtb_ext.BidderName]struct{}{},
+		},
+		{
+			description:             "one vendor exception",
+			configVendorExceptions:  []byte(`["vendor1"]`),
+			wantVendorExceptions:    []openrtb_ext.BidderName{openrtb_ext.BidderName("vendor1")},
+			wantVendorExceptionsMap: map[openrtb_ext.BidderName]struct{}{openrtb_ext.BidderName("vendor1"): {}},
+		},
+		{
+			description:             "many exceptions",
+			configVendorExceptions:  []byte(`["vendor1","vendor2"]`),
+			wantVendorExceptions:    []openrtb_ext.BidderName{openrtb_ext.BidderName("vendor1"), openrtb_ext.BidderName("vendor2")},
+			wantVendorExceptionsMap: map[openrtb_ext.BidderName]struct{}{openrtb_ext.BidderName("vendor1"): {}, openrtb_ext.BidderName("vendor2"): {}},
+		},
+	}
+
+	for _, tt := range tests {
+		config := append(baseConfig, tt.configVendorExceptions...)
+
+		v := viper.New()
+		SetupViper(v, "")
+		v.SetConfigType("yaml")
+		v.ReadConfig(bytes.NewBuffer(config))
+		cfg, err := New(v)
+		assert.NoError(t, err, "Setting up config error", tt.description)
+
+		assert.Equal(t, tt.wantVendorExceptions, cfg.GDPR.TCF2.SpecialFeature1.VendorExceptions, tt.description)
+		assert.Equal(t, tt.wantVendorExceptionsMap, cfg.GDPR.TCF2.SpecialFeature1.VendorExceptionMap, tt.description)
+	}
+}
diff --git a/config/stored_requests.go b/config/stored_requests.go
index e752e9e4d9d..9ff66149527 100644
--- a/config/stored_requests.go
+++ b/config/stored_requests.go
@@ -341,6 +341,10 @@ func (cfg *PostgresFetcherQueries) MakeQuery(numReqs int, numImps int) (query st
 	return resolve(cfg.QueryTemplate, numReqs, numImps)
 }
 
+func (cfg *PostgresFetcherQueries) MakeQueryResponses(numIds int) (query string) {
+	return resolveQueryResponses(cfg.QueryTemplate, numIds)
+}
+
 func resolve(template string, numReqs int, numImps int) (query string) {
 	numReqs = ensureNonNegative("Request", numReqs)
 	numImps = ensureNonNegative("Imp", numImps)
@@ -350,6 +354,13 @@ func resolve(template string, numReqs int, numImps int) (query string) {
 	return
 }
 
+func resolveQueryResponses(template string, numIds int) (query string) {
+	numIds = ensureNonNegative("Response", numIds)
+
+	query = strings.Replace(template, "%ID_LIST%", makeIdList(0, numIds), -1)
+	return
+}
+
 func ensureNonNegative(storedThing string, num int) int {
 	if num < 0 {
 		glog.Errorf("Can't build a SQL query for %d Stored %ss.", num, storedThing)
@@ -401,6 +412,8 @@ type InMemoryCache struct {
 	RequestCacheSize int `mapstructure:"request_cache_size_bytes"`
 	// ImpCacheSize is the max number of bytes allowed in the cache for Stored Imps. Values <= 0 will have no limit
 	ImpCacheSize int `mapstructure:"imp_cache_size_bytes"`
+	// ResponsesCacheSize is the max number of bytes allowed in the cache for Stored Responses. Values <= 0 will have no limit
+	RespCacheSize int `mapstructure:"resp_cache_size_bytes"`
 }
 
 func (cfg *InMemoryCache) validate(dataType DataType, errs []error) []error {
@@ -425,6 +438,9 @@ func (cfg *InMemoryCache) validate(dataType DataType, errs []error) []error {
 			if cfg.ImpCacheSize != 0 {
 				errs = append(errs, fmt.Errorf("%s: in_memory_cache.imp_cache_size_bytes is not supported for unbounded caches. Got %d", section, cfg.ImpCacheSize))
 			}
+			if cfg.RespCacheSize != 0 {
+				errs = append(errs, fmt.Errorf("%s: in_memory_cache.resp_cache_size_bytes is not supported for unbounded caches. Got %d", section, cfg.RespCacheSize))
+			}
 		}
 	case "lru":
 		if dataType == AccountDataType {
@@ -432,8 +448,8 @@ func (cfg *InMemoryCache) validate(dataType DataType, errs []error) []error {
 			if cfg.Size <= 0 {
 				errs = append(errs, fmt.Errorf("%s: in_memory_cache.size_bytes must be >= 0 when in_memory_cache.type=lru. Got %d", section, cfg.Size))
 			}
-			if cfg.RequestCacheSize > 0 || cfg.ImpCacheSize > 0 {
-				glog.Warningf("%s: in_memory_cache.request_cache_size_bytes and imp_cache_size_bytes do not apply to this section and will be ignored", section)
+			if cfg.RequestCacheSize > 0 || cfg.ImpCacheSize > 0 || cfg.RespCacheSize > 0 {
+				glog.Warningf("%s: in_memory_cache.request_cache_size_bytes, imp_cache_size_bytes and resp_cache_size_bytes do not apply to this section and will be ignored", section)
 			}
 		} else {
 			// dual (request and imp) caches
@@ -443,6 +459,9 @@ func (cfg *InMemoryCache) validate(dataType DataType, errs []error) []error {
 			if cfg.ImpCacheSize <= 0 {
 				errs = append(errs, fmt.Errorf("%s: in_memory_cache.imp_cache_size_bytes must be >= 0 when in_memory_cache.type=lru. Got %d", section, cfg.ImpCacheSize))
 			}
+			if cfg.RespCacheSize <= 0 {
+				errs = append(errs, fmt.Errorf("%s: in_memory_cache.resp_cache_size_bytes must be >= 0 when in_memory_cache.type=lru. Got %d", section, cfg.RespCacheSize))
+			}
 			if cfg.Size > 0 {
 				glog.Warningf("%s: in_memory_cache.size_bytes does not apply in this section and will be ignored", section)
 			}
diff --git a/config/stored_requests_test.go b/config/stored_requests_test.go
index 94213573133..ac468d2a32b 100644
--- a/config/stored_requests_test.go
+++ b/config/stored_requests_test.go
@@ -10,11 +10,13 @@ import (
 )
 
 const sampleQueryTemplate = "SELECT id, requestData, 'request' as type FROM stored_requests WHERE id in %REQUEST_ID_LIST% UNION ALL SELECT id, impData, 'imp' as type FROM stored_requests WHERE id in %IMP_ID_LIST%"
+const sampleResponsesQueryTemplate = "SELECT id, responseData, 'response' as type FROM stored_responses WHERE id in %ID_LIST%"
 
 func TestNormalQueryMaker(t *testing.T) {
 	madeQuery := buildQuery(sampleQueryTemplate, 1, 3)
 	assertStringsEqual(t, madeQuery, "SELECT id, requestData, 'request' as type FROM stored_requests WHERE id in ($1) UNION ALL SELECT id, impData, 'imp' as type FROM stored_requests WHERE id in ($2, $3, $4)")
 }
+
 func TestQueryMakerManyImps(t *testing.T) {
 	madeQuery := buildQuery(sampleQueryTemplate, 1, 11)
 	assertStringsEqual(t, madeQuery, "SELECT id, requestData, 'request' as type FROM stored_requests WHERE id in ($1) UNION ALL SELECT id, impData, 'imp' as type FROM stored_requests WHERE id in ($2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)")
@@ -41,6 +43,41 @@ func TestQueryMakerNegative(t *testing.T) {
 	assertStringsEqual(t, query, expected)
 }
 
+func TestResponseQueryMaker(t *testing.T) {
+	testCases := []struct {
+		description     string
+		inputRespNumber int
+		expectedQuery   string
+	}{
+		{
+			description:     "single response query maker",
+			inputRespNumber: 1,
+			expectedQuery:   "SELECT id, responseData, 'response' as type FROM stored_responses WHERE id in ($1)",
+		},
+		{
+			description:     "many responses query maker",
+			inputRespNumber: 11,
+			expectedQuery:   "SELECT id, responseData, 'response' as type FROM stored_responses WHERE id in ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11)",
+		},
+		{
+			description:     "no responses query maker",
+			inputRespNumber: 0,
+			expectedQuery:   "SELECT id, responseData, 'response' as type FROM stored_responses WHERE id in (NULL)",
+		},
+		{
+			description:     "no responses query maker",
+			inputRespNumber: -2,
+			expectedQuery:   "SELECT id, responseData, 'response' as type FROM stored_responses WHERE id in (NULL)",
+		},
+	}
+
+	for _, test := range testCases {
+		cfg := PostgresFetcherQueries{QueryTemplate: sampleResponsesQueryTemplate}
+		query := cfg.MakeQueryResponses(test.inputRespNumber)
+		assertStringsEqual(t, query, test.expectedQuery)
+	}
+}
+
 func TestPostgressConnString(t *testing.T) {
 	db := "TestDB"
 	host := "somehost.com"
@@ -89,6 +126,7 @@ func TestInMemoryCacheValidationStoredRequests(t *testing.T) {
 		Type:             "lru",
 		RequestCacheSize: 1000,
 		ImpCacheSize:     1000,
+		RespCacheSize:    1000,
 	}).validate(RequestDataType, nil))
 	assertErrsExist(t, (&InMemoryCache{
 		Type: "unrecognized",
@@ -101,6 +139,10 @@ func TestInMemoryCacheValidationStoredRequests(t *testing.T) {
 		Type:             "unbounded",
 		RequestCacheSize: 1000,
 	}).validate(RequestDataType, nil))
+	assertErrsExist(t, (&InMemoryCache{
+		Type:          "unbounded",
+		RespCacheSize: 1000,
+	}).validate(RequestDataType, nil))
 	assertErrsExist(t, (&InMemoryCache{
 		Type: "unbounded",
 		TTL:  500,
@@ -109,11 +151,19 @@ func TestInMemoryCacheValidationStoredRequests(t *testing.T) {
 		Type:             "lru",
 		RequestCacheSize: 0,
 		ImpCacheSize:     1000,
+		RespCacheSize:    1000,
 	}).validate(RequestDataType, nil))
 	assertErrsExist(t, (&InMemoryCache{
 		Type:             "lru",
 		RequestCacheSize: 1000,
 		ImpCacheSize:     0,
+		RespCacheSize:    1000,
+	}).validate(RequestDataType, nil))
+	assertErrsExist(t, (&InMemoryCache{
+		Type:             "lru",
+		RequestCacheSize: 1000,
+		ImpCacheSize:     1000,
+		RespCacheSize:    0,
 	}).validate(RequestDataType, nil))
 	assertErrsExist(t, (&InMemoryCache{
 		Type: "lru",
@@ -155,6 +205,10 @@ func TestInMemoryCacheValidationSingleCache(t *testing.T) {
 		Type:         "lru",
 		ImpCacheSize: 1000,
 	}).validate(AccountDataType, nil))
+	assertErrsExist(t, (&InMemoryCache{
+		Type:          "lru",
+		RespCacheSize: 1000,
+	}).validate(AccountDataType, nil))
 }
 
 func TestPostgresConfigValidation(t *testing.T) {
diff --git a/endpoints/openrtb2/amp_auction.go b/endpoints/openrtb2/amp_auction.go
index ff71770d671..38b2797081d 100644
--- a/endpoints/openrtb2/amp_auction.go
+++ b/endpoints/openrtb2/amp_auction.go
@@ -86,7 +86,8 @@ func NewAmpEndpoint(
 		bidderMap,
 		nil,
 		nil,
-		ipValidator}).AmpAuction), nil
+		ipValidator,
+		empty_fetcher.EmptyFetcher{}}).AmpAuction), nil
 
 }
 
diff --git a/endpoints/openrtb2/amp_auction_test.go b/endpoints/openrtb2/amp_auction_test.go
index 3f5eecfa0ad..62b0b604ad3 100644
--- a/endpoints/openrtb2/amp_auction_test.go
+++ b/endpoints/openrtb2/amp_auction_test.go
@@ -943,6 +943,10 @@ func (cf *mockAmpStoredReqFetcher) FetchRequests(ctx context.Context, requestIDs
 	return cf.data, nil, nil
 }
 
+func (cf *mockAmpStoredReqFetcher) FetchResponses(ctx context.Context, ids []string) (data map[string]json.RawMessage, errs []error) {
+	return nil, nil
+}
+
 type mockAmpExchange struct {
 	lastRequest *openrtb2.BidRequest
 }
diff --git a/endpoints/openrtb2/auction.go b/endpoints/openrtb2/auction.go
index 07d869dc5d4..4d68db50c0c 100644
--- a/endpoints/openrtb2/auction.go
+++ b/endpoints/openrtb2/auction.go
@@ -35,6 +35,7 @@ import (
 	"github.com/prebid/prebid-server/prebid_cache_client"
 	"github.com/prebid/prebid-server/privacy/ccpa"
 	"github.com/prebid/prebid-server/privacy/lmt"
+	"github.com/prebid/prebid-server/schain"
 	"github.com/prebid/prebid-server/stored_requests"
 	"github.com/prebid/prebid-server/stored_requests/backends/empty_fetcher"
 	"github.com/prebid/prebid-server/usersync"
@@ -66,6 +67,7 @@ func NewEndpoint(
 	disabledBidders map[string]string,
 	defReqJSON []byte,
 	bidderMap map[string]openrtb_ext.BidderName,
+	storedRespFetcher stored_requests.Fetcher,
 ) (httprouter.Handle, error) {
 	if ex == nil || validator == nil || requestsById == nil || accounts == nil || cfg == nil || met == nil {
 		return nil, errors.New("NewEndpoint requires non-nil arguments.")
@@ -94,7 +96,8 @@ func NewEndpoint(
 		bidderMap,
 		nil,
 		nil,
-		ipValidator}).Auction), nil
+		ipValidator,
+		storedRespFetcher}).Auction), nil
 }
 
 type endpointDeps struct {
@@ -114,6 +117,7 @@ type endpointDeps struct {
 	cache                     prebid_cache_client.Client
 	debugLogRegexp            *regexp.Regexp
 	privateNetworkIPValidator iputil.IPValidator
+	storedRespFetcher         stored_requests.Fetcher
 }
 
 func (deps *endpointDeps) Auction(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
@@ -525,6 +529,10 @@ func (deps *endpointDeps) validateRequest(req *openrtb_ext.RequestWrapper, isAmp
 		}
 	}
 
+	if err := mapSChains(req); err != nil {
+		return []error{err}
+	}
+
 	if err := validateOrFillChannel(req, isAmp); err != nil {
 		return []error{err}
 	}
@@ -589,6 +597,32 @@ func (deps *endpointDeps) validateRequest(req *openrtb_ext.RequestWrapper, isAmp
 	return errL
 }
 
+// mapSChains maps an schain defined in an ORTB 2.4 location (req.ext.schain) to the ORTB 2.5 location
+// (req.source.ext.schain) if no ORTB 2.5 schain (req.source.ext.schain, req.ext.prebid.schains) exists.
+// An ORTB 2.4 schain is always deleted from the 2.4 location regardless of whether an ORTB 2.5 schain exists.
+func mapSChains(req *openrtb_ext.RequestWrapper) error {
+	reqExt, err := req.GetRequestExt()
+	if err != nil {
+		return fmt.Errorf("req.ext is invalid: %v", err)
+	}
+	sourceExt, err := req.GetSourceExt()
+	if err != nil {
+		return fmt.Errorf("source.ext is invalid: %v", err)
+	}
+
+	reqExtSChain := reqExt.GetSChain()
+	reqExt.SetSChain(nil)
+
+	if reqPrebid := reqExt.GetPrebid(); reqPrebid != nil && reqPrebid.SChains != nil {
+		return nil
+	} else if sourceExt.GetSChain() != nil {
+		return nil
+	} else if reqExtSChain != nil {
+		sourceExt.SetSChain(reqExtSChain)
+	}
+	return nil
+}
+
 func validateAndFillSourceTID(req *openrtb2.BidRequest) error {
 	if req.Source == nil {
 		req.Source = &openrtb2.Source{}
@@ -618,7 +652,7 @@ func (deps *endpointDeps) validateBidAdjustmentFactors(adjustmentFactors map[str
 }
 
 func validateSChains(sChains []*openrtb_ext.ExtRequestPrebidSChain) error {
-	_, err := exchange.BidderToPrebidSChains(sChains)
+	_, err := schain.BidderToPrebidSChains(sChains)
 	return err
 }
 
diff --git a/endpoints/openrtb2/auction_benchmark_test.go b/endpoints/openrtb2/auction_benchmark_test.go
index 2a1300d72d7..bd61c21a746 100644
--- a/endpoints/openrtb2/auction_benchmark_test.go
+++ b/endpoints/openrtb2/auction_benchmark_test.go
@@ -98,6 +98,7 @@ func BenchmarkOpenrtbEndpoint(b *testing.B) {
 		map[string]string{},
 		[]byte{},
 		nil,
+		empty_fetcher.EmptyFetcher{},
 	)
 
 	b.ResetTimer()
diff --git a/endpoints/openrtb2/auction_test.go b/endpoints/openrtb2/auction_test.go
index a25bb406865..c42580fc1e7 100644
--- a/endpoints/openrtb2/auction_test.go
+++ b/endpoints/openrtb2/auction_test.go
@@ -437,7 +437,8 @@ func TestExplicitUserId(t *testing.T) {
 		analyticsConf.NewPBSAnalytics(&config.Analytics{}),
 		map[string]string{},
 		[]byte{},
-		openrtb_ext.BuildBidderMap())
+		openrtb_ext.BuildBidderMap(),
+		empty_fetcher.EmptyFetcher{})
 
 	endpoint(httptest.NewRecorder(), request, nil)
 
@@ -479,7 +480,8 @@ func doRequest(t *testing.T, test testCase) (int, string) {
 		analyticsConf.NewPBSAnalytics(&config.Analytics{}),
 		disabledBidders,
 		[]byte(test.Config.AliasJSON),
-		bidderMap)
+		bidderMap,
+		empty_fetcher.EmptyFetcher{})
 
 	request := httptest.NewRequest("POST", "/openrtb2/auction", bytes.NewReader(test.BidRequest))
 	recorder := httptest.NewRecorder()
@@ -543,7 +545,8 @@ func doBadAliasRequest(t *testing.T, filename string, expectMsg string) {
 		analyticsConf.NewPBSAnalytics(&config.Analytics{}),
 		disabledBidders,
 		aliasJSON,
-		bidderMap)
+		bidderMap,
+		empty_fetcher.EmptyFetcher{})
 
 	request := httptest.NewRequest("POST", "/openrtb2/auction", bytes.NewReader(testBidRequest))
 	recorder := httptest.NewRecorder()
@@ -593,7 +596,8 @@ func TestNilExchange(t *testing.T) {
 		&metricsConfig.NilMetricsEngine{},
 		analyticsConf.NewPBSAnalytics(&config.Analytics{}), map[string]string{},
 		[]byte{},
-		openrtb_ext.BuildBidderMap())
+		openrtb_ext.BuildBidderMap(),
+		empty_fetcher.EmptyFetcher{})
 
 	if err == nil {
 		t.Errorf("NewEndpoint should return an error when given a nil Exchange.")
@@ -615,7 +619,8 @@ func TestNilValidator(t *testing.T) {
 		analyticsConf.NewPBSAnalytics(&config.Analytics{}),
 		map[string]string{},
 		[]byte{},
-		openrtb_ext.BuildBidderMap())
+		openrtb_ext.BuildBidderMap(),
+		empty_fetcher.EmptyFetcher{})
 
 	if err == nil {
 		t.Errorf("NewEndpoint should return an error when given a nil BidderParamValidator.")
@@ -637,7 +642,8 @@ func TestExchangeError(t *testing.T) {
 		analyticsConf.NewPBSAnalytics(&config.Analytics{}),
 		map[string]string{},
 		[]byte{},
-		openrtb_ext.BuildBidderMap())
+		openrtb_ext.BuildBidderMap(),
+		empty_fetcher.EmptyFetcher{})
 
 	request := httptest.NewRequest("POST", "/openrtb2/auction", strings.NewReader(validRequest(t, "site.json")))
 	recorder := httptest.NewRecorder()
@@ -760,7 +766,8 @@ func TestImplicitIPsEndToEnd(t *testing.T) {
 			analyticsConf.NewPBSAnalytics(&config.Analytics{}),
 			map[string]string{},
 			[]byte{},
-			openrtb_ext.BuildBidderMap())
+			openrtb_ext.BuildBidderMap(),
+			empty_fetcher.EmptyFetcher{})
 
 		httpReq := httptest.NewRequest("POST", "/openrtb2/auction", strings.NewReader(validRequest(t, test.reqJSONFile)))
 		httpReq.Header.Set("X-Forwarded-For", test.xForwardedForHeader)
@@ -955,7 +962,8 @@ func TestImplicitDNTEndToEnd(t *testing.T) {
 			analyticsConf.NewPBSAnalytics(&config.Analytics{}),
 			map[string]string{},
 			[]byte{},
-			openrtb_ext.BuildBidderMap())
+			openrtb_ext.BuildBidderMap(),
+			empty_fetcher.EmptyFetcher{})
 
 		httpReq := httptest.NewRequest("POST", "/openrtb2/auction", strings.NewReader(validRequest(t, test.reqJSONFile)))
 		httpReq.Header.Set("DNT", test.dntHeader)
@@ -1115,6 +1123,7 @@ func TestStoredRequests(t *testing.T) {
 		nil,
 		nil,
 		hardcodedResponseIPValidator{response: true},
+		empty_fetcher.EmptyFetcher{},
 	}
 
 	testStoreVideoAttr := []bool{true, true, false, false}
@@ -1459,6 +1468,7 @@ func TestValidateRequest(t *testing.T) {
 		nil,
 		nil,
 		hardcodedResponseIPValidator{response: true},
+		empty_fetcher.EmptyFetcher{},
 	}
 
 	testCases := []struct {
@@ -1701,6 +1711,7 @@ func TestStoredRequestGenerateUuid(t *testing.T) {
 		nil,
 		nil,
 		hardcodedResponseIPValidator{response: true},
+		empty_fetcher.EmptyFetcher{},
 	}
 
 	req := &openrtb2.BidRequest{}
@@ -1807,6 +1818,7 @@ func TestOversizedRequest(t *testing.T) {
 		nil,
 		nil,
 		hardcodedResponseIPValidator{response: true},
+		empty_fetcher.EmptyFetcher{},
 	}
 
 	req := httptest.NewRequest("POST", "/openrtb2/auction", strings.NewReader(reqBody))
@@ -1843,6 +1855,7 @@ func TestRequestSizeEdgeCase(t *testing.T) {
 		nil,
 		nil,
 		hardcodedResponseIPValidator{response: true},
+		empty_fetcher.EmptyFetcher{},
 	}
 
 	req := httptest.NewRequest("POST", "/openrtb2/auction", strings.NewReader(reqBody))
@@ -1873,6 +1886,7 @@ func TestNoEncoding(t *testing.T) {
 		map[string]string{},
 		[]byte{},
 		openrtb_ext.BuildBidderMap(),
+		empty_fetcher.EmptyFetcher{},
 	)
 	request := httptest.NewRequest("POST", "/openrtb2/auction", strings.NewReader(validRequest(t, "site.json")))
 	recorder := httptest.NewRecorder()
@@ -1949,6 +1963,7 @@ func TestContentType(t *testing.T) {
 		map[string]string{},
 		[]byte{},
 		openrtb_ext.BuildBidderMap(),
+		empty_fetcher.EmptyFetcher{},
 	)
 	request := httptest.NewRequest("POST", "/openrtb2/auction", strings.NewReader(validRequest(t, "site.json")))
 	recorder := httptest.NewRecorder()
@@ -2167,6 +2182,7 @@ func TestValidateImpExt(t *testing.T) {
 		nil,
 		nil,
 		hardcodedResponseIPValidator{response: true},
+		empty_fetcher.EmptyFetcher{},
 	}
 
 	for _, group := range testGroups {
@@ -2214,6 +2230,7 @@ func TestCurrencyTrunc(t *testing.T) {
 		nil,
 		nil,
 		hardcodedResponseIPValidator{response: true},
+		empty_fetcher.EmptyFetcher{},
 	}
 
 	ui := int64(1)
@@ -2259,6 +2276,7 @@ func TestCCPAInvalid(t *testing.T) {
 		nil,
 		nil,
 		hardcodedResponseIPValidator{response: true},
+		empty_fetcher.EmptyFetcher{},
 	}
 
 	ui := int64(1)
@@ -2308,6 +2326,7 @@ func TestNoSaleInvalid(t *testing.T) {
 		nil,
 		nil,
 		hardcodedResponseIPValidator{response: true},
+		empty_fetcher.EmptyFetcher{},
 	}
 
 	ui := int64(1)
@@ -2360,6 +2379,7 @@ func TestValidateSourceTID(t *testing.T) {
 		nil,
 		nil,
 		hardcodedResponseIPValidator{response: true},
+		empty_fetcher.EmptyFetcher{},
 	}
 
 	ui := int64(1)
@@ -2402,6 +2422,7 @@ func TestSChainInvalid(t *testing.T) {
 		nil,
 		nil,
 		hardcodedResponseIPValidator{response: true},
+		empty_fetcher.EmptyFetcher{},
 	}
 
 	ui := int64(1)
@@ -2429,6 +2450,134 @@ func TestSChainInvalid(t *testing.T) {
 	assert.ElementsMatch(t, errL, []error{expectedError})
 }
 
+func TestMapSChains(t *testing.T) {
+	const seller1SChain string = `"schain":{"complete":1,"nodes":[{"asi":"directseller1.com","sid":"00001","rid":"BidRequest1","hp":1}],"ver":"1.0"}`
+	const seller2SChain string = `"schain":{"complete":2,"nodes":[{"asi":"directseller2.com","sid":"00002","rid":"BidRequest2","hp":2}],"ver":"2.0"}`
+
+	seller1SChainUnpacked := openrtb_ext.ExtRequestPrebidSChainSChain{
+		Complete: 1,
+		Nodes: []*openrtb_ext.ExtRequestPrebidSChainSChainNode{{
+			ASI: "directseller1.com",
+			SID: "00001",
+			RID: "BidRequest1",
+			HP:  1,
+		}},
+		Ver: "1.0",
+	}
+
+	tests := []struct {
+		description         string
+		bidRequest          openrtb2.BidRequest
+		wantReqExtSChain    *openrtb_ext.ExtRequestPrebidSChainSChain
+		wantSourceExtSChain *openrtb_ext.ExtRequestPrebidSChainSChain
+		wantError           bool
+	}{
+		{
+			description: "invalid req.ext",
+			bidRequest: openrtb2.BidRequest{
+				Ext: json.RawMessage(`{"prebid":{"schains":invalid}}`),
+				Source: &openrtb2.Source{
+					Ext: json.RawMessage(`{}`),
+				},
+			},
+			wantError: true,
+		},
+		{
+			description: "invalid source.ext",
+			bidRequest: openrtb2.BidRequest{
+				Ext: json.RawMessage(`{}`),
+				Source: &openrtb2.Source{
+					Ext: json.RawMessage(`{"schain":invalid}}`),
+				},
+			},
+			wantError: true,
+		},
+		{
+			description: "req.ext.prebid.schains, req.source.ext.schain and req.ext.schain are nil",
+			bidRequest: openrtb2.BidRequest{
+				Ext: json.RawMessage(`{}`),
+				Source: &openrtb2.Source{
+					Ext: json.RawMessage(`{}`),
+				},
+			},
+			wantReqExtSChain:    nil,
+			wantSourceExtSChain: nil,
+		},
+		{
+			description: "req.ext.prebid.schains is not nil",
+			bidRequest: openrtb2.BidRequest{
+				Ext: json.RawMessage(`{"prebid":{"schains":[{"bidders":["appnexus"],` + seller1SChain + `}]}}`),
+				Source: &openrtb2.Source{
+					Ext: json.RawMessage(`{}`),
+				},
+			},
+			wantReqExtSChain:    nil,
+			wantSourceExtSChain: nil,
+		},
+		{
+			description: "req.source.ext is not nil",
+			bidRequest: openrtb2.BidRequest{
+				Ext: json.RawMessage(`{}`),
+				Source: &openrtb2.Source{
+					Ext: json.RawMessage(`{` + seller1SChain + `}`),
+				},
+			},
+			wantReqExtSChain:    nil,
+			wantSourceExtSChain: &seller1SChainUnpacked,
+		},
+		{
+			description: "req.ext.schain is not nil",
+			bidRequest: openrtb2.BidRequest{
+				Ext: json.RawMessage(`{` + seller1SChain + `}`),
+				Source: &openrtb2.Source{
+					Ext: json.RawMessage(`{}`),
+				},
+			},
+			wantReqExtSChain:    nil,
+			wantSourceExtSChain: &seller1SChainUnpacked,
+		},
+		{
+			description: "req.source.ext.schain and req.ext.schain are not nil",
+			bidRequest: openrtb2.BidRequest{
+				Ext: json.RawMessage(`{` + seller2SChain + `}`),
+				Source: &openrtb2.Source{
+					Ext: json.RawMessage(`{` + seller1SChain + `}`),
+				},
+			},
+			wantReqExtSChain:    nil,
+			wantSourceExtSChain: &seller1SChainUnpacked,
+		},
+	}
+
+	for _, tt := range tests {
+		reqWrapper := openrtb_ext.RequestWrapper{
+			BidRequest: &tt.bidRequest,
+		}
+
+		err := mapSChains(&reqWrapper)
+
+		if tt.wantError {
+			assert.NotNil(t, err, tt.description)
+		} else {
+			assert.Nil(t, err, tt.description)
+
+			reqExt, err := reqWrapper.GetRequestExt()
+			if err != nil {
+				assert.Fail(t, "Error getting request ext from wrapper", tt.description)
+			}
+			reqExtSChain := reqExt.GetSChain()
+			assert.Equal(t, tt.wantReqExtSChain, reqExtSChain, tt.description)
+
+			sourceExt, err := reqWrapper.GetSourceExt()
+			if err != nil {
+				assert.Fail(t, "Error getting source ext from wrapper", tt.description)
+			}
+			sourceExtSChain := sourceExt.GetSChain()
+			assert.Equal(t, tt.wantSourceExtSChain, sourceExtSChain, tt.description)
+		}
+	}
+}
+
 func TestGetAccountID(t *testing.T) {
 	testPubID := "test-pub"
 	testParentAccount := "test-account"
@@ -2622,6 +2771,7 @@ func TestEidPermissionsInvalid(t *testing.T) {
 		nil,
 		nil,
 		hardcodedResponseIPValidator{response: true},
+		empty_fetcher.EmptyFetcher{},
 	}
 
 	ui := int64(1)
@@ -2868,7 +3018,8 @@ func TestIOS14EndToEnd(t *testing.T) {
 		analyticsConf.NewPBSAnalytics(&config.Analytics{}),
 		map[string]string{},
 		[]byte{},
-		openrtb_ext.BuildBidderMap())
+		openrtb_ext.BuildBidderMap(),
+		empty_fetcher.EmptyFetcher{})
 
 	httpReq := httptest.NewRequest("POST", "/openrtb2/auction", strings.NewReader(validRequest(t, "app-ios140-no-ifa.json")))
 
@@ -2902,6 +3053,7 @@ func TestAuctionWarnings(t *testing.T) {
 		nil,
 		nil,
 		hardcodedResponseIPValidator{response: true},
+		empty_fetcher.EmptyFetcher{},
 	}
 
 	req := httptest.NewRequest("POST", "/openrtb2/auction", strings.NewReader(reqBody))
@@ -2942,6 +3094,7 @@ func TestParseRequestParseImpInfoError(t *testing.T) {
 		nil,
 		nil,
 		hardcodedResponseIPValidator{response: true},
+		empty_fetcher.EmptyFetcher{},
 	}
 
 	req := httptest.NewRequest("POST", "/openrtb2/auction", strings.NewReader(reqBody))
@@ -2973,6 +3126,7 @@ func TestAuctionFirstPartyData(t *testing.T) {
 		nil,
 		nil,
 		hardcodedResponseIPValidator{response: true},
+		empty_fetcher.EmptyFetcher{},
 	}
 
 	req := httptest.NewRequest("POST", "/openrtb2/auction", strings.NewReader(reqBody))
@@ -4249,6 +4403,10 @@ func (cf mockStoredReqFetcher) FetchRequests(ctx context.Context, requestIDs []s
 	return testStoredRequestData, testStoredImpData, nil
 }
 
+func (cf mockStoredReqFetcher) FetchResponses(ctx context.Context, ids []string) (data map[string]json.RawMessage, errs []error) {
+	return nil, nil
+}
+
 type mockExchange struct {
 	lastRequest *openrtb2.BidRequest
 }
@@ -4392,6 +4550,7 @@ func TestParseRequestMergeBidderParams(t *testing.T) {
 				nil,
 				nil,
 				hardcodedResponseIPValidator{response: true},
+				empty_fetcher.EmptyFetcher{},
 			}
 
 			req := httptest.NewRequest("POST", "/openrtb2/auction", strings.NewReader(tt.givenRequestBody))
diff --git a/endpoints/openrtb2/video_auction.go b/endpoints/openrtb2/video_auction.go
index 60372c384c9..cbffe2e3ccc 100644
--- a/endpoints/openrtb2/video_auction.go
+++ b/endpoints/openrtb2/video_auction.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/prebid/prebid-server/stored_requests/backends/empty_fetcher"
 	"io"
 	"io/ioutil"
 	"net/http"
@@ -82,7 +83,8 @@ func NewVideoEndpoint(
 		bidderMap,
 		cache,
 		videoEndpointRegexp,
-		ipValidator}).VideoAuctionEndpoint), nil
+		ipValidator,
+		empty_fetcher.EmptyFetcher{}}).VideoAuctionEndpoint), nil
 }
 
 /*
diff --git a/endpoints/openrtb2/video_auction_test.go b/endpoints/openrtb2/video_auction_test.go
index b7eb0b27c0b..91512a2e97d 100644
--- a/endpoints/openrtb2/video_auction_test.go
+++ b/endpoints/openrtb2/video_auction_test.go
@@ -1226,6 +1226,7 @@ func mockDepsWithMetrics(t *testing.T, ex *mockExchangeVideo) (*endpointDeps, *m
 		nil,
 		nil,
 		hardcodedResponseIPValidator{response: true},
+		empty_fetcher.EmptyFetcher{},
 	}
 	return deps, metrics, mockModule
 }
@@ -1269,6 +1270,7 @@ func mockDeps(t *testing.T, ex *mockExchangeVideo) *endpointDeps {
 		ex.cache,
 		regexp.MustCompile(`[<>]`),
 		hardcodedResponseIPValidator{response: true},
+		empty_fetcher.EmptyFetcher{},
 	}
 
 	return deps
@@ -1292,6 +1294,7 @@ func mockDepsAppendBidderNames(t *testing.T, ex *mockExchangeAppendBidderNames)
 		ex.cache,
 		regexp.MustCompile(`[<>]`),
 		hardcodedResponseIPValidator{response: true},
+		empty_fetcher.EmptyFetcher{},
 	}
 
 	return deps
@@ -1315,6 +1318,7 @@ func mockDepsNoBids(t *testing.T, ex *mockExchangeVideoNoBids) *endpointDeps {
 		ex.cache,
 		regexp.MustCompile(`[<>]`),
 		hardcodedResponseIPValidator{response: true},
+		empty_fetcher.EmptyFetcher{},
 	}
 
 	return edep
@@ -1342,6 +1346,10 @@ func (cf mockVideoStoredReqFetcher) FetchRequests(ctx context.Context, requestID
 	return testVideoStoredRequestData, testVideoStoredImpData, nil
 }
 
+func (cf mockVideoStoredReqFetcher) FetchResponses(ctx context.Context, ids []string) (data map[string]json.RawMessage, errs []error) {
+	return nil, nil
+}
+
 type mockExchangeVideo struct {
 	lastRequest *openrtb2.BidRequest
 	cache       *mockCacheClient
diff --git a/exchange/adapter_builders.go b/exchange/adapter_builders.go
index 0f14b75c27f..8075b7f1ff5 100755
--- a/exchange/adapter_builders.go
+++ b/exchange/adapter_builders.go
@@ -28,6 +28,7 @@ import (
 	"github.com/prebid/prebid-server/adapters/aja"
 	"github.com/prebid/prebid-server/adapters/algorix"
 	"github.com/prebid/prebid-server/adapters/amx"
+	"github.com/prebid/prebid-server/adapters/apacdex"
 	"github.com/prebid/prebid-server/adapters/applogy"
 	"github.com/prebid/prebid-server/adapters/appnexus"
 	"github.com/prebid/prebid-server/adapters/audienceNetwork"
@@ -44,6 +45,7 @@ import (
 	"github.com/prebid/prebid-server/adapters/brightroll"
 	"github.com/prebid/prebid-server/adapters/coinzilla"
 	"github.com/prebid/prebid-server/adapters/colossus"
+	"github.com/prebid/prebid-server/adapters/compass"
 	"github.com/prebid/prebid-server/adapters/connectad"
 	"github.com/prebid/prebid-server/adapters/consumable"
 	"github.com/prebid/prebid-server/adapters/conversant"
@@ -122,7 +124,6 @@ import (
 	"github.com/prebid/prebid-server/adapters/ucfunnel"
 	"github.com/prebid/prebid-server/adapters/unicorn"
 	"github.com/prebid/prebid-server/adapters/unruly"
-	"github.com/prebid/prebid-server/adapters/valueimpression"
 	"github.com/prebid/prebid-server/adapters/videobyte"
 	"github.com/prebid/prebid-server/adapters/visx"
 	"github.com/prebid/prebid-server/adapters/vrtcal"
@@ -167,6 +168,7 @@ func newAdapterBuilders() map[openrtb_ext.BidderName]adapters.Builder {
 		openrtb_ext.BidderAJA:               aja.Builder,
 		openrtb_ext.BidderAlgorix:           algorix.Builder,
 		openrtb_ext.BidderAMX:               amx.Builder,
+		openrtb_ext.BidderApacdex:           apacdex.Builder,
 		openrtb_ext.BidderApplogy:           applogy.Builder,
 		openrtb_ext.BidderAppnexus:          appnexus.Builder,
 		openrtb_ext.BidderAudienceNetwork:   audienceNetwork.Builder,
@@ -183,6 +185,7 @@ func newAdapterBuilders() map[openrtb_ext.BidderName]adapters.Builder {
 		openrtb_ext.BidderBrightroll:        brightroll.Builder,
 		openrtb_ext.BidderCoinzilla:         coinzilla.Builder,
 		openrtb_ext.BidderColossus:          colossus.Builder,
+		openrtb_ext.BidderCompass:           compass.Builder,
 		openrtb_ext.BidderConnectAd:         connectad.Builder,
 		openrtb_ext.BidderConsumable:        consumable.Builder,
 		openrtb_ext.BidderConversant:        conversant.Builder,
@@ -239,6 +242,7 @@ func newAdapterBuilders() map[openrtb_ext.BidderName]adapters.Builder {
 		openrtb_ext.BidderPubmatic:          pubmatic.Builder,
 		openrtb_ext.BidderPubnative:         pubnative.Builder,
 		openrtb_ext.BidderPulsepoint:        pulsepoint.Builder,
+		openrtb_ext.BidderQuantumdex:        apacdex.Builder,
 		openrtb_ext.BidderRevcontent:        revcontent.Builder,
 		openrtb_ext.BidderRhythmone:         rhythmone.Builder,
 		openrtb_ext.BidderRichaudience:      richaudience.Builder,
@@ -265,7 +269,7 @@ func newAdapterBuilders() map[openrtb_ext.BidderName]adapters.Builder {
 		openrtb_ext.BidderUcfunnel:          ucfunnel.Builder,
 		openrtb_ext.BidderUnicorn:           unicorn.Builder,
 		openrtb_ext.BidderUnruly:            unruly.Builder,
-		openrtb_ext.BidderValueImpression:   valueimpression.Builder,
+		openrtb_ext.BidderValueImpression:   apacdex.Builder,
 		openrtb_ext.BidderVerizonMedia:      yahoossp.Builder,
 		openrtb_ext.BidderVideoByte:         videobyte.Builder,
 		openrtb_ext.BidderViewdeos:          adtelligent.Builder,
diff --git a/exchange/utils.go b/exchange/utils.go
index 48f76b2a734..ec5b666d609 100644
--- a/exchange/utils.go
+++ b/exchange/utils.go
@@ -20,6 +20,7 @@ import (
 	"github.com/prebid/prebid-server/privacy"
 	"github.com/prebid/prebid-server/privacy/ccpa"
 	"github.com/prebid/prebid-server/privacy/lmt"
+	"github.com/prebid/prebid-server/schain"
 )
 
 var integrationTypeMap = map[metrics.RequestType]config.IntegrationType{
@@ -31,23 +32,6 @@ var integrationTypeMap = map[metrics.RequestType]config.IntegrationType{
 
 const unknownBidder string = ""
 
-func BidderToPrebidSChains(sChains []*openrtb_ext.ExtRequestPrebidSChain) (map[string]*openrtb_ext.ExtRequestPrebidSChainSChain, error) {
-	bidderToSChains := make(map[string]*openrtb_ext.ExtRequestPrebidSChainSChain)
-
-	for _, schainWrapper := range sChains {
-		for _, bidder := range schainWrapper.Bidders {
-			if _, present := bidderToSChains[bidder]; present {
-				return nil, fmt.Errorf("request.ext.prebid.schains contains multiple schains for bidder %s; "+
-					"it must contain no more than one per bidder.", bidder)
-			} else {
-				bidderToSChains[bidder] = &schainWrapper.SChain
-			}
-		}
-	}
-
-	return bidderToSChains, nil
-}
-
 // cleanOpenRTBRequests splits the input request into requests which are sanitized for each bidder. Intended behavior is:
 //
 //   1. BidRequest.Imp[].Ext will only contain the "prebid" field and a "bidder" field which has the params for the intended Bidder.
@@ -228,14 +212,9 @@ func getAuctionBidderRequests(req AuctionRequest,
 		return nil, []error{err}
 	}
 
-	var sChainsByBidder map[string]*openrtb_ext.ExtRequestPrebidSChainSChain
-
-	// Quick extra wrapper until RequestWrapper makes its way into CleanRequests
-	if requestExt != nil {
-		sChainsByBidder, err = BidderToPrebidSChains(requestExt.Prebid.SChains)
-		if err != nil {
-			return nil, []error{err}
-		}
+	sChainWriter, err := schain.NewSChainWriter(requestExt)
+	if err != nil {
+		return nil, []error{err}
 	}
 
 	var errs []error
@@ -245,7 +224,7 @@ func getAuctionBidderRequests(req AuctionRequest,
 		reqCopy := *req.BidRequest
 		reqCopy.Imp = imps
 
-		prepareSource(&reqCopy, bidder, sChainsByBidder)
+		sChainWriter.Write(&reqCopy, bidder)
 
 		if len(bidderParamsInReqExt) != 0 {
 
@@ -318,40 +297,6 @@ func getExtJson(req *openrtb2.BidRequest, unpackedExt *openrtb_ext.ExtRequest) (
 	return json.Marshal(extCopy)
 }
 
-func prepareSource(req *openrtb2.BidRequest, bidder string, sChainsByBidder map[string]*openrtb_ext.ExtRequestPrebidSChainSChain) {
-	const sChainWildCard = "*"
-	var selectedSChain *openrtb_ext.ExtRequestPrebidSChainSChain
-
-	wildCardSChain := sChainsByBidder[sChainWildCard]
-	bidderSChain := sChainsByBidder[bidder]
-
-	// source should not be modified
-	if bidderSChain == nil && wildCardSChain == nil {
-		return
-	}
-
-	if bidderSChain != nil {
-		selectedSChain = bidderSChain
-	} else {
-		selectedSChain = wildCardSChain
-	}
-
-	// set source
-	if req.Source == nil {
-		req.Source = &openrtb2.Source{}
-	} else {
-		sourceCopy := *req.Source
-		req.Source = &sourceCopy
-	}
-	schain := openrtb_ext.ExtRequestPrebidSChain{
-		SChain: *selectedSChain,
-	}
-	sourceExt, err := json.Marshal(schain)
-	if err == nil {
-		req.Source.Ext = sourceExt
-	}
-}
-
 // extractBuyerUIDs parses the values from user.ext.prebid.buyeruids, and then deletes those values from the ext.
 // This prevents a Bidder from using these values to figure out who else is involved in the Auction.
 func extractBuyerUIDs(user *openrtb2.User) (map[string]string, error) {
diff --git a/exchange/utils_test.go b/exchange/utils_test.go
index c10e294f7ad..f67b6ffbefe 100644
--- a/exchange/utils_test.go
+++ b/exchange/utils_test.go
@@ -837,83 +837,60 @@ func TestCleanOpenRTBRequestsCOPPA(t *testing.T) {
 }
 
 func TestCleanOpenRTBRequestsSChain(t *testing.T) {
+	const seller1SChain string = `"schain":{"complete":1,"nodes":[{"asi":"directseller1.com","sid":"00001","rid":"BidRequest1","hp":1}],"ver":"1.0"}`
+	const seller2SChain string = `"schain":{"complete":2,"nodes":[{"asi":"directseller2.com","sid":"00002","rid":"BidRequest2","hp":2}],"ver":"2.0"}`
+
 	testCases := []struct {
 		description   string
 		inExt         json.RawMessage
 		inSourceExt   json.RawMessage
-		outSourceExt  json.RawMessage
 		outRequestExt json.RawMessage
+		outSourceExt  json.RawMessage
 		hasError      bool
 	}{
 		{
-			description:   "Empty root ext and source ext, nil unmarshaled ext",
-			inExt:         nil,
-			inSourceExt:   json.RawMessage(``),
-			outSourceExt:  json.RawMessage(``),
-			outRequestExt: json.RawMessage(``),
-			hasError:      false,
-		},
-		{
-			description:   "Empty root ext, source ext, and unmarshaled ext",
-			inExt:         json.RawMessage(``),
-			inSourceExt:   json.RawMessage(``),
-			outSourceExt:  json.RawMessage(``),
-			outRequestExt: json.RawMessage(``),
-			hasError:      false,
+			description:   "source.ext is nil",
+			inExt:         json.RawMessage{},
+			inSourceExt:   nil,
+			outRequestExt: json.RawMessage{},
+			outSourceExt:  nil,
 		},
 		{
-			description:   "No schains in root ext and empty source ext. Unmarshaled ext is equivalent to root ext",
-			inSourceExt:   json.RawMessage(``),
-			inExt:         json.RawMessage(`{"prebid":{"schains":[]}}`),
-			outSourceExt:  json.RawMessage(``),
-			outRequestExt: json.RawMessage(`{"prebid":{}}`),
-			hasError:      false,
+			description:   "source.ext is defined with length 0",
+			inExt:         json.RawMessage{},
+			inSourceExt:   json.RawMessage{},
+			outRequestExt: json.RawMessage{},
+			outSourceExt:  json.RawMessage{},
 		},
 		{
-			description:   "Use source schain -- no bidder schain or wildcard schain in ext.prebid.schains. Unmarshaled ext is equivalent to root ext",
-			inSourceExt:   json.RawMessage(`{"schain":{"complete":1,"nodes":[{"asi":"example.com","sid":"example1","rid":"ExampleReq1","hp":1}],"ver":"1.0"}}`),
-			inExt:         json.RawMessage(`{"prebid":{"schains":[{"bidders":["bidder1"],"schain":{"complete":1,"nodes":[{"asi":"directseller.com","sid":"00001","rid":"BidRequest1","hp":1}],"ver":"1.0"}}]}}`),
-			outSourceExt:  json.RawMessage(`{"schain":{"complete":1,"nodes":[{"asi":"example.com","sid":"example1","rid":"ExampleReq1","hp":1}],"ver":"1.0"}}`),
-			outRequestExt: json.RawMessage(`{"prebid":{}}`),
-			hasError:      false,
+			description:   "ORTB 2.5 chain at source.ext.schain",
+			inExt:         json.RawMessage{},
+			inSourceExt:   json.RawMessage(`{` + seller1SChain + `}`),
+			outRequestExt: json.RawMessage{},
+			outSourceExt:  json.RawMessage(`{` + seller1SChain + `}`),
 		},
 		{
-			description:   "Use schain for bidder in ext.prebid.schains. Unmarshaled ext is equivalent to root ext",
-			inSourceExt:   json.RawMessage(``),
-			inExt:         json.RawMessage(`{"prebid":{"schains":[{"bidders":["appnexus"],"schain":{"complete":1,"nodes":[{"asi":"directseller.com","sid":"00001","rid":"BidRequest1","hp":1}],"ver":"1.0"}}]}}`),
-			outSourceExt:  json.RawMessage(`{"schain":{"complete":1,"nodes":[{"asi":"directseller.com","sid":"00001","rid":"BidRequest1","hp":1}],"ver":"1.0"}}`),
+			description:   "ORTB 2.5 schain at request.ext.prebid.schains",
+			inExt:         json.RawMessage(`{"prebid":{"schains":[{"bidders":["appnexus"],` + seller1SChain + `}]}}`),
+			inSourceExt:   json.RawMessage{},
 			outRequestExt: json.RawMessage(`{"prebid":{}}`),
-			hasError:      false,
+			outSourceExt:  json.RawMessage(`{` + seller1SChain + `}`),
 		},
 		{
-			description:   "Use wildcard schain in ext.prebid.schains. Unmarshaled ext is equivalent to root ext",
-			inSourceExt:   json.RawMessage(``),
-			inExt:         json.RawMessage(`{"prebid":{"schains":[{"bidders":["*"],"schain":{"complete":1,"nodes":[{"asi":"directseller.com","sid":"00001","rid":"BidRequest1","hp":1}],"ver":"1.0"}}]}}`),
-			outSourceExt:  json.RawMessage(`{"schain":{"complete":1,"nodes":[{"asi":"directseller.com","sid":"00001","rid":"BidRequest1","hp":1}],"ver":"1.0"}}`),
-			outRequestExt: json.RawMessage(`{"prebid":{}}`),
-			hasError:      false,
-		},
-		{
-			description:   "Use schain for bidder in ext.prebid.schains instead of wildcard. Unmarshaled ext is equivalent to root ext",
-			inSourceExt:   json.RawMessage(``),
-			inExt:         json.RawMessage(`{"prebid":{"aliases":{"appnexus":"alias1"},"schains":[{"bidders":["appnexus"],"schain":{"complete":1,"nodes":[{"asi":"directseller.com","sid":"00001","rid":"BidRequest1","hp":1}],"ver":"1.0"}}, {"bidders":["*"],"schain":{"complete":1,"nodes":[{"asi":"wildcard.com","sid":"wildcard1","rid":"WildcardReq1","hp":1}],"ver":"1.0"}} ]}}`),
-			outSourceExt:  json.RawMessage(`{"schain":{"complete":1,"nodes":[{"asi":"directseller.com","sid":"00001","rid":"BidRequest1","hp":1}],"ver":"1.0"}}`),
-			outRequestExt: json.RawMessage(`{"prebid":{"aliases":{"appnexus":"alias1"}}}`),
-			hasError:      false,
-		},
-		{
-			description:   "Use source schain -- multiple (two) bidder schains in ext.prebid.schains. Unmarshaled ext is equivalent to root ext",
-			inSourceExt:   json.RawMessage(`{"schain":{"complete":1,"nodes":[{"asi":"example.com","sid":"example1","rid":"ExampleReq1","hp":1}],"ver":"1.0"}}`),
-			inExt:         json.RawMessage(`{"prebid":{"schains":[{"bidders":["appnexus"],"schain":{"complete":1,"nodes":[{"asi":"directseller1.com","sid":"00001","rid":"BidRequest1","hp":1}],"ver":"1.0"}}, {"bidders":["appnexus"],"schain":{"complete":1,"nodes":[{"asi":"directseller2.com","sid":"00002","rid":"BidRequest2","hp":1}],"ver":"1.0"}}]}}`),
-			outSourceExt:  nil,
+			description:   "schainwriter instantation error -- multiple bidder schains in ext.prebid.schains.",
+			inExt:         json.RawMessage(`{"prebid":{"schains":[{"bidders":["appnexus"],` + seller1SChain + `},{"bidders":["appnexus"],` + seller2SChain + `}]}}`),
+			inSourceExt:   json.RawMessage(`{` + seller1SChain + `}`),
 			outRequestExt: nil,
+			outSourceExt:  nil,
 			hasError:      true,
 		},
 	}
 
 	for _, test := range testCases {
 		req := newBidRequest(t)
-		req.Source.Ext = test.inSourceExt
+		if test.inSourceExt != nil {
+			req.Source.Ext = test.inSourceExt
+		}
 
 		var extRequest *openrtb_ext.ExtRequest
 		if test.inExt != nil {
@@ -2173,101 +2150,6 @@ func TestRandomizeList(t *testing.T) {
 	}
 }
 
-func TestBidderToPrebidChains(t *testing.T) {
-	input := openrtb_ext.ExtRequest{
-		Prebid: openrtb_ext.ExtRequestPrebid{
-			SChains: []*openrtb_ext.ExtRequestPrebidSChain{
-				{
-					Bidders: []string{"Bidder1", "Bidder2"},
-					SChain: openrtb_ext.ExtRequestPrebidSChainSChain{
-						Complete: 1,
-						Nodes: []*openrtb_ext.ExtRequestPrebidSChainSChainNode{
-							{
-								ASI:    "asi1",
-								SID:    "sid1",
-								Name:   "name1",
-								RID:    "rid1",
-								Domain: "domain1",
-								HP:     1,
-							},
-							{
-								ASI:    "asi2",
-								SID:    "sid2",
-								Name:   "name2",
-								RID:    "rid2",
-								Domain: "domain2",
-								HP:     2,
-							},
-						},
-						Ver: "version1",
-					},
-				},
-				{
-					Bidders: []string{"Bidder3", "Bidder4"},
-					SChain:  openrtb_ext.ExtRequestPrebidSChainSChain{},
-				},
-			},
-		},
-	}
-
-	output, err := BidderToPrebidSChains(input.Prebid.SChains)
-
-	assert.Nil(t, err)
-	assert.Equal(t, len(output), 4)
-	assert.Same(t, output["Bidder1"], &input.Prebid.SChains[0].SChain)
-	assert.Same(t, output["Bidder2"], &input.Prebid.SChains[0].SChain)
-	assert.Same(t, output["Bidder3"], &input.Prebid.SChains[1].SChain)
-	assert.Same(t, output["Bidder4"], &input.Prebid.SChains[1].SChain)
-}
-
-func TestBidderToPrebidChainsDiscardMultipleChainsForBidder(t *testing.T) {
-	input := openrtb_ext.ExtRequest{
-		Prebid: openrtb_ext.ExtRequestPrebid{
-			SChains: []*openrtb_ext.ExtRequestPrebidSChain{
-				{
-					Bidders: []string{"Bidder1"},
-					SChain:  openrtb_ext.ExtRequestPrebidSChainSChain{},
-				},
-				{
-					Bidders: []string{"Bidder1", "Bidder2"},
-					SChain:  openrtb_ext.ExtRequestPrebidSChainSChain{},
-				},
-			},
-		},
-	}
-
-	output, err := BidderToPrebidSChains(input.Prebid.SChains)
-
-	assert.NotNil(t, err)
-	assert.Nil(t, output)
-}
-
-func TestBidderToPrebidChainsNilSChains(t *testing.T) {
-	input := openrtb_ext.ExtRequest{
-		Prebid: openrtb_ext.ExtRequestPrebid{
-			SChains: nil,
-		},
-	}
-
-	output, err := BidderToPrebidSChains(input.Prebid.SChains)
-
-	assert.Nil(t, err)
-	assert.Equal(t, len(output), 0)
-}
-
-func TestBidderToPrebidChainsZeroLengthSChains(t *testing.T) {
-	input := openrtb_ext.ExtRequest{
-		Prebid: openrtb_ext.ExtRequestPrebid{
-			SChains: []*openrtb_ext.ExtRequestPrebidSChain{},
-		},
-	}
-
-	output, err := BidderToPrebidSChains(input.Prebid.SChains)
-
-	assert.Nil(t, err)
-	assert.Equal(t, len(output), 0)
-}
-
 func TestRemoveUnpermissionedEids(t *testing.T) {
 	bidder := "bidderA"
 
@@ -2745,47 +2627,6 @@ func TestBuildXPrebidHeader(t *testing.T) {
 	}
 }
 
-func TestSourceExtSChainCopied(t *testing.T) {
-	bidRequest := newBidRequest(t)
-
-	bidderSchains := map[string]*openrtb_ext.ExtRequestPrebidSChainSChain{
-		"bidder1": {
-			Ver:      "1.0",
-			Complete: 1,
-			Nodes: []*openrtb_ext.ExtRequestPrebidSChainSChainNode{
-				{
-					ASI: "bidder1.com",
-					SID: "0001",
-					HP:  1,
-				},
-			},
-		},
-		"bidder2": {
-			Ver:      "1.0",
-			Complete: 1,
-			Nodes: []*openrtb_ext.ExtRequestPrebidSChainSChainNode{
-				{
-					ASI: "bidder2.com",
-					SID: "0002",
-					HP:  1,
-				},
-			},
-		},
-	}
-
-	copy1 := *bidRequest
-	originalTid := copy1.Source.TID
-	prepareSource(&copy1, "bidder1", bidderSchains)
-	copy2 := *bidRequest
-	copy2.Source.TID = "new TID"
-	prepareSource(&copy2, "bidder2", bidderSchains)
-
-	assert.Equal(t, json.RawMessage(`{"schain":{"complete":1,"nodes":[{"asi":"bidder1.com","sid":"0001","hp":1}],"ver":"1.0"}}`), copy1.Source.Ext, "First schain was overwritten or not set")
-	assert.Equal(t, originalTid, copy1.Source.TID, "Original TID was overwritten")
-	assert.Equal(t, json.RawMessage(`{"schain":{"complete":1,"nodes":[{"asi":"bidder2.com","sid":"0002","hp":1}],"ver":"1.0"}}`), copy2.Source.Ext, "Second schain was overwritten or not set")
-	assert.Equal(t, "new TID", copy2.Source.TID, "New TID was not set")
-}
-
 func TestCleanOpenRTBRequestsSChainMultipleBidders(t *testing.T) {
 	req := &openrtb2.BidRequest{
 		Site: &openrtb2.Site{},
diff --git a/gdpr/impl.go b/gdpr/impl.go
index 07aad36d765..c85c9d285de 100644
--- a/gdpr/impl.go
+++ b/gdpr/impl.go
@@ -132,9 +132,9 @@ func (p *permissionsImpl) allowActivities(ctx context.Context, vendorID uint16,
 		return
 	}
 
-	if p.cfg.TCF2.SpecialPurpose1.Enabled {
-		vendorException := p.isSpecialPurposeVendorException(bidder)
-		passGeo = vendorException || (consentMeta.SpecialFeatureOptIn(1) && (vendor.SpecialPurpose(1) || weakVendorEnforcement))
+	if p.cfg.TCF2.SpecialFeature1.Enforce {
+		vendorException := p.isSpecialFeatureVendorException(bidder)
+		passGeo = vendorException || (consentMeta.SpecialFeatureOptIn(1) && (vendor.SpecialFeature(1) || weakVendorEnforcement))
 	} else {
 		passGeo = true
 	}
@@ -162,8 +162,8 @@ func (p *permissionsImpl) isVendorException(purpose consentconstants.Purpose, bi
 	return
 }
 
-func (p *permissionsImpl) isSpecialPurposeVendorException(bidder openrtb_ext.BidderName) (vendorException bool) {
-	if _, ok := p.cfg.TCF2.SpecialPurpose1.VendorExceptionMap[bidder]; ok {
+func (p *permissionsImpl) isSpecialFeatureVendorException(bidder openrtb_ext.BidderName) (vendorException bool) {
+	if _, ok := p.cfg.TCF2.SpecialFeature1.VendorExceptionMap[bidder]; ok {
 		vendorException = true
 	}
 	return
@@ -295,6 +295,9 @@ func (v vendorTrue) LegitimateInterest(purposeID consentconstants.Purpose) bool
 func (v vendorTrue) LegitimateInterestStrict(purposeID consentconstants.Purpose) bool {
 	return true
 }
+func (v vendorTrue) SpecialFeature(featureID consentconstants.SpecialFeature) (hasSpecialFeature bool) {
+	return true
+}
 func (v vendorTrue) SpecialPurpose(purposeID consentconstants.Purpose) (hasSpecialPurpose bool) {
 	return true
 }
diff --git a/gdpr/impl_test.go b/gdpr/impl_test.go
index 3064a9fda89..9bdf7f85111 100644
--- a/gdpr/impl_test.go
+++ b/gdpr/impl_test.go
@@ -341,7 +341,7 @@ func buildVendorList34() vendorList {
 				ID:               6,
 				Purposes:         []int{1, 2, 4},
 				LegIntPurposes:   []int{7},
-				SpecialPurposes:  []int{1},
+				SpecialFeatures:  []int{1},
 				FlexiblePurposes: []int{1, 2, 4, 7},
 			},
 			"8": {
@@ -352,7 +352,7 @@ func buildVendorList34() vendorList {
 			"10": {
 				ID:              10,
 				Purposes:        []int{2, 4, 7},
-				SpecialPurposes: []int{1},
+				SpecialFeatures: []int{1},
 			},
 			"20": {
 				ID:               20,
@@ -384,7 +384,7 @@ func allPurposesEnabledPermissions() (perms permissionsImpl) {
 				Purpose8:        config.TCF2Purpose{EnforcePurpose: config.TCF2FullEnforcement, EnforceVendors: true},
 				Purpose9:        config.TCF2Purpose{EnforcePurpose: config.TCF2FullEnforcement, EnforceVendors: true},
 				Purpose10:       config.TCF2Purpose{EnforcePurpose: config.TCF2FullEnforcement, EnforceVendors: true},
-				SpecialPurpose1: config.TCF2Purpose{Enabled: true, EnforceVendors: true},
+				SpecialFeature1: config.TCF2SpecialFeature{Enforce: true},
 			},
 		},
 	}
@@ -431,7 +431,7 @@ func TestAllowActivitiesGeoAndID(t *testing.T) {
 		}),
 	}
 
-	// COzTVhaOzTVhaGvAAAENAiCIAP_AAH_AAAAAAEEUACCKAAA : full consents to purposes and vendors 2, 6, 8
+	// COzTVhaOzTVhaGvAAAENAiCIAP_AAH_AAAAAAEEUACCKAAA : full consents to purposes and vendors 2, 6, 8 and special feature 1 opt-in
 	testDefs := []testDef{
 		{
 			description: "Appnexus vendor test, insufficient purposes claimed",
@@ -536,7 +536,7 @@ func TestAllowActivitiesPubRestrict(t *testing.T) {
 	}
 
 	// COwAdDhOwAdDhN4ABAENAPCgAAQAAv___wAAAFP_AAp_4AI6ACACAA - vendors 1-10 legit interest only,
-	// Pub restriction on purpose 7, consent only ... no allowPI will pass, no Special purpose 1 consent
+	// Pub restriction on purpose 7, consent only ... no allowPI will pass, no special feature 1 consent
 	testDefs := []testDef{
 		{
 			description: "Appnexus vendor test, insufficient purposes claimed",
@@ -840,7 +840,7 @@ func TestAllowActivitiesVendorException(t *testing.T) {
 	testDefs := []struct {
 		description           string
 		p2VendorExceptionMap  map[openrtb_ext.BidderName]struct{}
-		sp1VendorExceptionMap map[openrtb_ext.BidderName]struct{}
+		sf1VendorExceptionMap map[openrtb_ext.BidderName]struct{}
 		bidder                openrtb_ext.BidderName
 		consent               string
 		allowBid              bool
@@ -859,7 +859,7 @@ func TestAllowActivitiesVendorException(t *testing.T) {
 		{
 			description:           "Bid/ID allowed by vendor exception - p2 enabled with p2 vendor exception, pub restricts none",
 			p2VendorExceptionMap:  map[openrtb_ext.BidderName]struct{}{openrtb_ext.BidderAppnexus: {}},
-			sp1VendorExceptionMap: map[openrtb_ext.BidderName]struct{}{},
+			sf1VendorExceptionMap: map[openrtb_ext.BidderName]struct{}{},
 			bidder:                openrtb_ext.BidderAppnexus,
 			consent:               noPurposeOrVendorConsentAndPubRestrictsNone,
 			allowBid:              true,
@@ -867,9 +867,9 @@ func TestAllowActivitiesVendorException(t *testing.T) {
 			passID:                true,
 		},
 		{
-			description:           "Geo blocked - sp1 enabled but no consent",
+			description:           "Geo blocked - sf1 enabled but no consent",
 			p2VendorExceptionMap:  map[openrtb_ext.BidderName]struct{}{},
-			sp1VendorExceptionMap: map[openrtb_ext.BidderName]struct{}{},
+			sf1VendorExceptionMap: map[openrtb_ext.BidderName]struct{}{},
 			bidder:                openrtb_ext.BidderAppnexus,
 			consent:               noPurposeOrVendorConsentAndPubRestrictsNone,
 			allowBid:              false,
@@ -877,9 +877,9 @@ func TestAllowActivitiesVendorException(t *testing.T) {
 			passID:                false,
 		},
 		{
-			description:           "Geo allowed by vendor exception - sp1 enabled with sp1 vendor exception",
+			description:           "Geo allowed by vendor exception - sf1 enabled with sf1 vendor exception",
 			p2VendorExceptionMap:  map[openrtb_ext.BidderName]struct{}{},
-			sp1VendorExceptionMap: map[openrtb_ext.BidderName]struct{}{openrtb_ext.BidderAppnexus: {}},
+			sf1VendorExceptionMap: map[openrtb_ext.BidderName]struct{}{openrtb_ext.BidderAppnexus: {}},
 			bidder:                openrtb_ext.BidderAppnexus,
 			consent:               noPurposeOrVendorConsentAndPubRestrictsNone,
 			allowBid:              false,
@@ -896,7 +896,7 @@ func TestAllowActivitiesVendorException(t *testing.T) {
 				TCF2: config.TCF2{
 					Enabled:         true,
 					Purpose2:        config.TCF2Purpose{EnforcePurpose: config.TCF2FullEnforcement, VendorExceptionMap: td.p2VendorExceptionMap},
-					SpecialPurpose1: config.TCF2Purpose{Enabled: true, VendorExceptionMap: td.sp1VendorExceptionMap},
+					SpecialFeature1: config.TCF2SpecialFeature{Enforce: true, VendorExceptionMap: td.sf1VendorExceptionMap},
 				},
 			},
 			vendorIDs: map[openrtb_ext.BidderName]uint16{
diff --git a/gdpr/vendorlist-fetching_test.go b/gdpr/vendorlist-fetching_test.go
index 95529e4e334..a1a926f50d3 100644
--- a/gdpr/vendorlist-fetching_test.go
+++ b/gdpr/vendorlist-fetching_test.go
@@ -189,7 +189,7 @@ type vendor struct {
 	Purposes         []int  `json:"purposes"`
 	LegIntPurposes   []int  `json:"legIntPurposes"`
 	FlexiblePurposes []int  `json:"flexiblePurposes"`
-	SpecialPurposes  []int  `json:"specialPurposes"`
+	SpecialFeatures  []int  `json:"specialFeatures"`
 }
 
 func MarshalVendorList(vendorList vendorList) string {
diff --git a/go.mod b/go.mod
index 1dad3f3e9de..589f4f3c10e 100644
--- a/go.mod
+++ b/go.mod
@@ -21,7 +21,7 @@ require (
 	github.com/mattn/go-colorable v0.1.2 // indirect
 	github.com/mitchellh/copystructure v1.1.2
 	github.com/mxmCherry/openrtb/v15 v15.0.0
-	github.com/prebid/go-gdpr v1.10.0
+	github.com/prebid/go-gdpr v1.11.0
 	github.com/prometheus/client_golang v1.11.0
 	github.com/prometheus/client_model v0.2.0
 	github.com/rcrowley/go-metrics v0.0.0-20180503174638-e2704e165165
diff --git a/go.sum b/go.sum
index fc3dbb34025..0bbfb4e9896 100644
--- a/go.sum
+++ b/go.sum
@@ -287,8 +287,8 @@ github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZ
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
-github.com/prebid/go-gdpr v1.10.0 h1:f9Ua+PAIK97j82QkJtIsohlbyU8961mFphw23hTsoMo=
-github.com/prebid/go-gdpr v1.10.0/go.mod h1:mPZAdkRxn+iuSjaUuJAi9+0SppBOdM1PCzv/55UH3pY=
+github.com/prebid/go-gdpr v1.11.0 h1:QbMjscuw3Ul0mDVWeMy5tP0Kii6lmTSSVhV6fm8rY9s=
+github.com/prebid/go-gdpr v1.11.0/go.mod h1:mPZAdkRxn+iuSjaUuJAi9+0SppBOdM1PCzv/55UH3pY=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
 github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
diff --git a/openrtb_ext/bidders.go b/openrtb_ext/bidders.go
index 7ebfe631bdb..941f1a561f0 100644
--- a/openrtb_ext/bidders.go
+++ b/openrtb_ext/bidders.go
@@ -103,6 +103,7 @@ const (
 	BidderAJA               BidderName = "aja"
 	BidderAlgorix           BidderName = "algorix"
 	BidderAMX               BidderName = "amx"
+	BidderApacdex           BidderName = "apacdex"
 	BidderApplogy           BidderName = "applogy"
 	BidderAppnexus          BidderName = "appnexus"
 	BidderAudienceNetwork   BidderName = "audienceNetwork"
@@ -119,6 +120,7 @@ const (
 	BidderBrightroll        BidderName = "brightroll"
 	BidderCoinzilla         BidderName = "coinzilla"
 	BidderColossus          BidderName = "colossus"
+	BidderCompass           BidderName = "compass"
 	BidderConnectAd         BidderName = "connectad"
 	BidderConsumable        BidderName = "consumable"
 	BidderConversant        BidderName = "conversant"
@@ -175,6 +177,7 @@ const (
 	BidderPubmatic          BidderName = "pubmatic"
 	BidderPubnative         BidderName = "pubnative"
 	BidderPulsepoint        BidderName = "pulsepoint"
+	BidderQuantumdex        BidderName = "quantumdex"
 	BidderRevcontent        BidderName = "revcontent"
 	BidderRhythmone         BidderName = "rhythmone"
 	BidderRichaudience      BidderName = "richaudience"
@@ -246,6 +249,7 @@ func CoreBidderNames() []BidderName {
 		BidderAJA,
 		BidderAlgorix,
 		BidderAMX,
+		BidderApacdex,
 		BidderApplogy,
 		BidderAppnexus,
 		BidderAudienceNetwork,
@@ -262,6 +266,7 @@ func CoreBidderNames() []BidderName {
 		BidderBrightroll,
 		BidderCoinzilla,
 		BidderColossus,
+		BidderCompass,
 		BidderConnectAd,
 		BidderConsumable,
 		BidderConversant,
@@ -318,6 +323,7 @@ func CoreBidderNames() []BidderName {
 		BidderPubmatic,
 		BidderPubnative,
 		BidderPulsepoint,
+		BidderQuantumdex,
 		BidderRevcontent,
 		BidderRhythmone,
 		BidderRichaudience,
diff --git a/openrtb_ext/imp_apacdex.go b/openrtb_ext/imp_apacdex.go
new file mode 100644
index 00000000000..dc8fb15b123
--- /dev/null
+++ b/openrtb_ext/imp_apacdex.go
@@ -0,0 +1,7 @@
+package openrtb_ext
+
+type ExtImpApacdex struct {
+	PlacementID string  `json:"placementId"`
+	SiteID      string  `json:"siteId"`
+	FloorPrice  float64 `json:"floorPrice"`
+}
diff --git a/openrtb_ext/imp_compass.go b/openrtb_ext/imp_compass.go
new file mode 100644
index 00000000000..3a150b9daaf
--- /dev/null
+++ b/openrtb_ext/imp_compass.go
@@ -0,0 +1,6 @@
+package openrtb_ext
+
+type ImpExtCompass struct {
+	PlacementID string `json:"placementId"`
+	EndpointID  string `json:"endpointId"`
+}
diff --git a/openrtb_ext/imp_rubicon.go b/openrtb_ext/imp_rubicon.go
index f9b15ed3223..a09b18ae273 100644
--- a/openrtb_ext/imp_rubicon.go
+++ b/openrtb_ext/imp_rubicon.go
@@ -6,9 +6,9 @@ import (
 
 // ExtImpRubicon defines the contract for bidrequest.imp[i].ext.rubicon
 type ExtImpRubicon struct {
-	AccountId int                `json:"accountId"`
-	SiteId    int                `json:"siteId"`
-	ZoneId    int                `json:"zoneId"`
+	AccountId json.Number        `json:"accountId"`
+	SiteId    json.Number        `json:"siteId"`
+	ZoneId    json.Number        `json:"zoneId"`
 	Inventory json.RawMessage    `json:"inventory,omitempty"`
 	Keywords  []string           `json:"keywords,omitempty"`
 	Visitor   json.RawMessage    `json:"visitor,omitempty"`
@@ -18,12 +18,12 @@ type ExtImpRubicon struct {
 
 // rubiconVideoParams defines the contract for bidrequest.imp[i].ext.rubicon.video
 type rubiconVideoParams struct {
-	Language     string `json:"language,omitempty"`
-	PlayerHeight int    `json:"playerHeight,omitempty"`
-	PlayerWidth  int    `json:"playerWidth,omitempty"`
-	VideoSizeID  int    `json:"size_id,omitempty"`
-	Skip         int    `json:"skip,omitempty"`
-	SkipDelay    int    `json:"skipdelay,omitempty"`
+	Language     string      `json:"language,omitempty"`
+	PlayerHeight json.Number `json:"playerHeight,omitempty"`
+	PlayerWidth  json.Number `json:"playerWidth,omitempty"`
+	VideoSizeID  int         `json:"size_id,omitempty"`
+	Skip         int         `json:"skip,omitempty"`
+	SkipDelay    int         `json:"skipdelay,omitempty"`
 }
 
 // rubiconVideoParams defines the contract for bidrequest.imp[i].ext.rubicon.debug
diff --git a/openrtb_ext/imp_valueimpression.go b/openrtb_ext/imp_valueimpression.go
deleted file mode 100644
index 7c5c70ee0a7..00000000000
--- a/openrtb_ext/imp_valueimpression.go
+++ /dev/null
@@ -1,5 +0,0 @@
-package openrtb_ext
-
-type ExtImpValueImpression struct {
-	SiteId string `json:"siteId"`
-}
diff --git a/openrtb_ext/request.go b/openrtb_ext/request.go
index dba30863f6c..ecd913b1610 100644
--- a/openrtb_ext/request.go
+++ b/openrtb_ext/request.go
@@ -24,7 +24,8 @@ const MaxDecimalFigures int = 15
 
 // ExtRequest defines the contract for bidrequest.ext
 type ExtRequest struct {
-	Prebid ExtRequestPrebid `json:"prebid"`
+	Prebid ExtRequestPrebid              `json:"prebid"`
+	SChain *ExtRequestPrebidSChainSChain `json:"schain,omitempty"`
 }
 
 // ExtRequestPrebid defines the contract for bidrequest.ext.prebid
@@ -96,11 +97,6 @@ type ExtRequestPrebidSChainSChainNode struct {
 	Ext    json.RawMessage `json:"ext,omitempty"`
 }
 
-// SourceExt defines the contract for bidrequest.source.ext
-type SourceExt struct {
-	SChain ExtRequestPrebidSChainSChain `json:"schain"`
-}
-
 // ExtRequestPrebidChannel defines the contract for bidrequest.ext.prebid.channel
 type ExtRequestPrebidChannel struct {
 	Name    string `json:"name"`
diff --git a/openrtb_ext/request_wrapper.go b/openrtb_ext/request_wrapper.go
index 9219bbdbc9e..dfc2a41fc44 100644
--- a/openrtb_ext/request_wrapper.go
+++ b/openrtb_ext/request_wrapper.go
@@ -38,6 +38,7 @@ type RequestWrapper struct {
 	appExt     *AppExt
 	regExt     *RegExt
 	siteExt    *SiteExt
+	sourceExt  *SourceExt
 }
 
 func (rw *RequestWrapper) GetUserExt() (*UserExt, error) {
@@ -107,6 +108,17 @@ func (rw *RequestWrapper) GetSiteExt() (*SiteExt, error) {
 	return rw.siteExt, rw.siteExt.unmarshal(rw.Site.Ext)
 }
 
+func (rw *RequestWrapper) GetSourceExt() (*SourceExt, error) {
+	if rw.sourceExt != nil {
+		return rw.sourceExt, nil
+	}
+	rw.sourceExt = &SourceExt{}
+	if rw.BidRequest == nil || rw.Source == nil || rw.Source.Ext == nil {
+		return rw.sourceExt, rw.sourceExt.unmarshal(json.RawMessage{})
+	}
+	return rw.sourceExt, rw.sourceExt.unmarshal(rw.Source.Ext)
+}
+
 func (rw *RequestWrapper) RebuildRequest() error {
 	if rw.BidRequest == nil {
 		return errors.New("Requestwrapper Sync called on a nil BidRequest")
@@ -130,6 +142,9 @@ func (rw *RequestWrapper) RebuildRequest() error {
 	if err := rw.rebuildSiteExt(); err != nil {
 		return err
 	}
+	if err := rw.rebuildSourceExt(); err != nil {
+		return err
+	}
 
 	return nil
 }
@@ -215,6 +230,20 @@ func (rw *RequestWrapper) rebuildSiteExt() error {
 	return nil
 }
 
+func (rw *RequestWrapper) rebuildSourceExt() error {
+	if rw.Source == nil && rw.sourceExt != nil && rw.sourceExt.Dirty() {
+		rw.Source = &openrtb2.Source{}
+	}
+	if rw.sourceExt != nil && rw.sourceExt.Dirty() {
+		sourceJson, err := rw.sourceExt.marshal()
+		if err != nil {
+			return err
+		}
+		rw.Source.Ext = sourceJson
+	}
+	return nil
+}
+
 // ---------------------------------------------------------------
 // UserExt provides an interface for request.user.ext
 // ---------------------------------------------------------------
@@ -382,6 +411,8 @@ type RequestExt struct {
 	extDirty    bool
 	prebid      *ExtRequestPrebid
 	prebidDirty bool
+	schain      *ExtRequestPrebidSChainSChain // ORTB 2.4 location
+	schainDirty bool
 }
 
 func (re *RequestExt) unmarshal(extJson json.RawMessage) error {
@@ -401,6 +432,11 @@ func (re *RequestExt) unmarshal(extJson json.RawMessage) error {
 		re.prebid = &ExtRequestPrebid{}
 		err = json.Unmarshal(prebidJson, re.prebid)
 	}
+	schainJson, hasSChain := re.ext["schain"]
+	if hasSChain {
+		re.schain = &ExtRequestPrebidSChainSChain{}
+		err = json.Unmarshal(schainJson, re.schain)
+	}
 
 	return err
 }
@@ -419,6 +455,22 @@ func (re *RequestExt) marshal() (json.RawMessage, error) {
 		re.prebidDirty = false
 	}
 
+	if re.schainDirty {
+		if re.schain == nil {
+		}
+
+		schainJson, err := json.Marshal(re.schain)
+		if err != nil {
+			return nil, err
+		}
+		if len(schainJson) > 2 && re.schain != nil {
+			re.ext["schain"] = json.RawMessage(schainJson)
+		} else {
+			delete(re.ext, "schain")
+		}
+		re.schainDirty = false
+	}
+
 	re.extDirty = false
 	if len(re.ext) == 0 {
 		return nil, nil
@@ -427,7 +479,7 @@ func (re *RequestExt) marshal() (json.RawMessage, error) {
 }
 
 func (re *RequestExt) Dirty() bool {
-	return re.extDirty || re.prebidDirty
+	return re.extDirty || re.prebidDirty || re.schainDirty
 }
 
 func (re *RequestExt) GetExt() map[string]json.RawMessage {
@@ -456,6 +508,22 @@ func (re *RequestExt) SetPrebid(prebid *ExtRequestPrebid) {
 	re.prebidDirty = true
 }
 
+// These schain methods on the request.ext are only for ORTB 2.4 backwards compatibility and
+// should not be used for any other purposes. To access ORTB 2.5 schains, see source.ext.schain
+// or request.ext.prebid.schains.
+func (re *RequestExt) GetSChain() *ExtRequestPrebidSChainSChain {
+	if re.schain == nil {
+		return nil
+	}
+	schain := *re.schain
+	return &schain
+}
+
+func (re *RequestExt) SetSChain(schain *ExtRequestPrebidSChainSChain) {
+	re.schain = schain
+	re.schainDirty = true
+}
+
 // ---------------------------------------------------------------
 // DeviceExt provides an interface for request.device.ext
 // ---------------------------------------------------------------
@@ -785,3 +853,85 @@ func (se *SiteExt) SetUSPrivacy(amp int8) {
 	se.amp = amp
 	se.ampDirty = true
 }
+
+// ---------------------------------------------------------------
+// SourceExt provides an interface for request.source.ext
+// ---------------------------------------------------------------
+
+type SourceExt struct {
+	ext         map[string]json.RawMessage
+	extDirty    bool
+	schain      *ExtRequestPrebidSChainSChain
+	schainDirty bool
+}
+
+func (se *SourceExt) unmarshal(extJson json.RawMessage) error {
+	if len(se.ext) != 0 || se.Dirty() {
+		return nil
+	}
+	se.ext = make(map[string]json.RawMessage)
+	if len(extJson) == 0 {
+		return nil
+	}
+	err := json.Unmarshal(extJson, &se.ext)
+	if err != nil {
+		return err
+	}
+	schainJson, hasSChain := se.ext["schain"]
+	if hasSChain {
+		err = json.Unmarshal(schainJson, &se.schain)
+	}
+
+	return err
+}
+
+func (se *SourceExt) marshal() (json.RawMessage, error) {
+	if se.schainDirty {
+		schainJson, err := json.Marshal(se.schain)
+		if err != nil {
+			return nil, err
+		}
+		if len(schainJson) > 2 {
+			se.ext["schain"] = json.RawMessage(schainJson)
+		} else {
+			delete(se.ext, "schain")
+		}
+		se.schainDirty = false
+	}
+
+	se.extDirty = false
+	if len(se.ext) == 0 {
+		return nil, nil
+	}
+	return json.Marshal(se.ext)
+}
+
+func (se *SourceExt) Dirty() bool {
+	return se.extDirty || se.schainDirty
+}
+
+func (se *SourceExt) GetExt() map[string]json.RawMessage {
+	ext := make(map[string]json.RawMessage)
+	for k, v := range se.ext {
+		ext[k] = v
+	}
+	return ext
+}
+
+func (se *SourceExt) SetExt(ext map[string]json.RawMessage) {
+	se.ext = ext
+	se.extDirty = true
+}
+
+func (se *SourceExt) GetSChain() *ExtRequestPrebidSChainSChain {
+	if se.schain == nil {
+		return nil
+	}
+	schain := *se.schain
+	return &schain
+}
+
+func (se *SourceExt) SetSChain(schain *ExtRequestPrebidSChainSChain) {
+	se.schain = schain
+	se.schainDirty = true
+}
diff --git a/openrtb_ext/request_wrapper_test.go b/openrtb_ext/request_wrapper_test.go
index 06cad49aedf..60ef1a33263 100644
--- a/openrtb_ext/request_wrapper_test.go
+++ b/openrtb_ext/request_wrapper_test.go
@@ -1,6 +1,7 @@
 package openrtb_ext
 
 import (
+	"encoding/json"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -14,9 +15,29 @@ func TestUserExt(t *testing.T) {
 	userExt.unmarshal(nil)
 	assert.Equal(t, false, userExt.Dirty(), "New UserExt should not be dirty.")
 	assert.Nil(t, userExt.GetConsent(), "Empty UserExt should have nil consent")
+	assert.Nil(t, userExt.GetEid(), "Empty UserExt should have nil eid")
+	assert.Nil(t, userExt.GetPrebid(), "Empty UserExt should have nil prebid")
 
 	newConsent := "NewConsent"
 	userExt.SetConsent(&newConsent)
-	assert.Equal(t, "NewConsent", *userExt.GetConsent())
+	assert.Equal(t, "NewConsent", *userExt.GetConsent(), "UserExt consent is incorrect")
 
+	newEid := []ExtUserEid{{}}
+	userExt.SetEid(&newEid)
+	assert.Equal(t, []ExtUserEid{{}}, *userExt.GetEid(), "UserExt eid is incorrect")
+
+	buyerIDs := map[string]string{"buyer": "id"}
+	newPrebid := ExtUserPrebid{BuyerUIDs: buyerIDs}
+	userExt.SetPrebid(&newPrebid)
+	assert.Equal(t, ExtUserPrebid{BuyerUIDs: buyerIDs}, *userExt.GetPrebid(), "UserExt prebid is icorrect")
+
+	assert.Equal(t, true, userExt.Dirty(), "UserExt should be dirty after field updates")
+
+	updatedUserExt, err := userExt.marshal()
+	assert.Nil(t, err, "Marshalling UserExt after updating should not cause an error")
+
+	expectedUserExt := json.RawMessage(`{"consent":"NewConsent","prebid":{"buyeruids":{"buyer":"id"}},"eids":[{"source":""}]}`)
+	assert.JSONEq(t, string(updatedUserExt), string(expectedUserExt), "Marshalled UserExt is incorrect")
+
+	assert.Equal(t, false, userExt.Dirty(), "UserExt should not be dirty after marshalling")
 }
diff --git a/openrtb_ext/source.go b/openrtb_ext/source.go
new file mode 100644
index 00000000000..70b291b11fc
--- /dev/null
+++ b/openrtb_ext/source.go
@@ -0,0 +1,6 @@
+package openrtb_ext
+
+// ExtSource defines the contract for bidrequest.source.ext
+type ExtSource struct {
+	SChain *ExtRequestPrebidSChainSChain `json:"schain"`
+}
diff --git a/router/router.go b/router/router.go
index 81623f13838..44314409a49 100644
--- a/router/router.go
+++ b/router/router.go
@@ -177,7 +177,7 @@ func New(cfg *config.Configuration, rateConvertor *currency.RateConverter) (r *R
 
 	// Metrics engine
 	r.MetricsEngine = metricsConf.NewMetricsEngine(cfg, openrtb_ext.CoreBidderNames(), syncerKeys)
-	shutdown, fetcher, ampFetcher, accounts, categoriesFetcher, videoFetcher := storedRequestsConf.NewStoredRequests(cfg, r.MetricsEngine, generalHttpClient, r.Router)
+	shutdown, fetcher, ampFetcher, accounts, categoriesFetcher, videoFetcher, storedRespFetcher := storedRequestsConf.NewStoredRequests(cfg, r.MetricsEngine, generalHttpClient, r.Router)
 	// todo(zachbadgett): better shutdown
 	r.Shutdown = shutdown
 
@@ -209,7 +209,7 @@ func New(cfg *config.Configuration, rateConvertor *currency.RateConverter) (r *R
 
 	theExchange := exchange.NewExchange(adapters, cacheClient, cfg, syncersByBidder, r.MetricsEngine, bidderInfos, gdprPerms, rateConvertor, categoriesFetcher)
 	var uuidGenerator uuidutil.UUIDRandomGenerator
-	openrtbEndpoint, err := openrtb2.NewEndpoint(uuidGenerator, theExchange, paramsValidator, fetcher, accounts, cfg, r.MetricsEngine, pbsAnalytics, disabledBidders, defReqJSON, activeBidders)
+	openrtbEndpoint, err := openrtb2.NewEndpoint(uuidGenerator, theExchange, paramsValidator, fetcher, accounts, cfg, r.MetricsEngine, pbsAnalytics, disabledBidders, defReqJSON, activeBidders, storedRespFetcher)
 	if err != nil {
 		glog.Fatalf("Failed to create the openrtb2 endpoint handler. %v", err)
 	}
diff --git a/schain/schain.go b/schain/schain.go
new file mode 100644
index 00000000000..785c7e24d7f
--- /dev/null
+++ b/schain/schain.go
@@ -0,0 +1,25 @@
+package schain
+
+import (
+	"fmt"
+
+	"github.com/prebid/prebid-server/openrtb_ext"
+)
+
+// BidderToPrebidSChains organizes the ORTB 2.5 multiple root schain nodes into a map of schain nodes by bidder
+func BidderToPrebidSChains(sChains []*openrtb_ext.ExtRequestPrebidSChain) (map[string]*openrtb_ext.ExtRequestPrebidSChainSChain, error) {
+	bidderToSChains := make(map[string]*openrtb_ext.ExtRequestPrebidSChainSChain)
+
+	for _, schainWrapper := range sChains {
+		for _, bidder := range schainWrapper.Bidders {
+			if _, present := bidderToSChains[bidder]; present {
+				return nil, fmt.Errorf("request.ext.prebid.schains contains multiple schains for bidder %s; "+
+					"it must contain no more than one per bidder.", bidder)
+			} else {
+				bidderToSChains[bidder] = &schainWrapper.SChain
+			}
+		}
+	}
+
+	return bidderToSChains, nil
+}
diff --git a/schain/schain_test.go b/schain/schain_test.go
new file mode 100644
index 00000000000..22903d69e85
--- /dev/null
+++ b/schain/schain_test.go
@@ -0,0 +1,103 @@
+package schain
+
+import (
+	"testing"
+
+	"github.com/prebid/prebid-server/openrtb_ext"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestBidderToPrebidChains(t *testing.T) {
+	input := openrtb_ext.ExtRequest{
+		Prebid: openrtb_ext.ExtRequestPrebid{
+			SChains: []*openrtb_ext.ExtRequestPrebidSChain{
+				{
+					Bidders: []string{"Bidder1", "Bidder2"},
+					SChain: openrtb_ext.ExtRequestPrebidSChainSChain{
+						Complete: 1,
+						Nodes: []*openrtb_ext.ExtRequestPrebidSChainSChainNode{
+							{
+								ASI:    "asi1",
+								SID:    "sid1",
+								Name:   "name1",
+								RID:    "rid1",
+								Domain: "domain1",
+								HP:     1,
+							},
+							{
+								ASI:    "asi2",
+								SID:    "sid2",
+								Name:   "name2",
+								RID:    "rid2",
+								Domain: "domain2",
+								HP:     2,
+							},
+						},
+						Ver: "version1",
+					},
+				},
+				{
+					Bidders: []string{"Bidder3", "Bidder4"},
+					SChain:  openrtb_ext.ExtRequestPrebidSChainSChain{},
+				},
+			},
+		},
+	}
+
+	output, err := BidderToPrebidSChains(input.Prebid.SChains)
+
+	assert.Nil(t, err)
+	assert.Equal(t, len(output), 4)
+	assert.Same(t, output["Bidder1"], &input.Prebid.SChains[0].SChain)
+	assert.Same(t, output["Bidder2"], &input.Prebid.SChains[0].SChain)
+	assert.Same(t, output["Bidder3"], &input.Prebid.SChains[1].SChain)
+	assert.Same(t, output["Bidder4"], &input.Prebid.SChains[1].SChain)
+}
+
+func TestBidderToPrebidChainsDiscardMultipleChainsForBidder(t *testing.T) {
+	input := openrtb_ext.ExtRequest{
+		Prebid: openrtb_ext.ExtRequestPrebid{
+			SChains: []*openrtb_ext.ExtRequestPrebidSChain{
+				{
+					Bidders: []string{"Bidder1"},
+					SChain:  openrtb_ext.ExtRequestPrebidSChainSChain{},
+				},
+				{
+					Bidders: []string{"Bidder1", "Bidder2"},
+					SChain:  openrtb_ext.ExtRequestPrebidSChainSChain{},
+				},
+			},
+		},
+	}
+
+	output, err := BidderToPrebidSChains(input.Prebid.SChains)
+
+	assert.NotNil(t, err)
+	assert.Nil(t, output)
+}
+
+func TestBidderToPrebidChainsNilSChains(t *testing.T) {
+	input := openrtb_ext.ExtRequest{
+		Prebid: openrtb_ext.ExtRequestPrebid{
+			SChains: nil,
+		},
+	}
+
+	output, err := BidderToPrebidSChains(input.Prebid.SChains)
+
+	assert.Nil(t, err)
+	assert.Equal(t, len(output), 0)
+}
+
+func TestBidderToPrebidChainsZeroLengthSChains(t *testing.T) {
+	input := openrtb_ext.ExtRequest{
+		Prebid: openrtb_ext.ExtRequestPrebid{
+			SChains: []*openrtb_ext.ExtRequestPrebidSChain{},
+		},
+	}
+
+	output, err := BidderToPrebidSChains(input.Prebid.SChains)
+
+	assert.Nil(t, err)
+	assert.Equal(t, len(output), 0)
+}
diff --git a/schain/schainwriter.go b/schain/schainwriter.go
new file mode 100644
index 00000000000..bf2f564017f
--- /dev/null
+++ b/schain/schainwriter.go
@@ -0,0 +1,78 @@
+package schain
+
+import (
+	"encoding/json"
+
+	"github.com/mxmCherry/openrtb/v15/openrtb2"
+	"github.com/prebid/prebid-server/openrtb_ext"
+)
+
+// NewSChainWriter creates an ORTB 2.5 schain writer instance
+func NewSChainWriter(reqExt *openrtb_ext.ExtRequest) (*SChainWriter, error) {
+	if !extPrebidSChainExists(reqExt) {
+		return &SChainWriter{}, nil
+	}
+
+	sChainsByBidder, err := BidderToPrebidSChains(reqExt.Prebid.SChains)
+	if err != nil {
+		return nil, err
+	}
+
+	writer := SChainWriter{
+		sChainsByBidder: sChainsByBidder,
+	}
+	return &writer, nil
+}
+
+// SChainWriter is used to write the appropriate schain for a particular bidder defined in the ORTB 2.5 multi-schain
+// location (req.ext.prebid.schain) to the ORTB 2.5 location (req.source.ext)
+type SChainWriter struct {
+	sChainsByBidder map[string]*openrtb_ext.ExtRequestPrebidSChainSChain
+}
+
+// Write selects an schain from the multi-schain ORTB 2.5 location (req.ext.prebid.schains) for the specified bidder
+// and copies it to the ORTB 2.5 location (req.source.ext). If no schain exists for the bidder in the multi-schain
+// location and no wildcard schain exists, the request is not modified.
+func (w SChainWriter) Write(req *openrtb2.BidRequest, bidder string) {
+	const sChainWildCard = "*"
+	var selectedSChain *openrtb_ext.ExtRequestPrebidSChainSChain
+
+	wildCardSChain := w.sChainsByBidder[sChainWildCard]
+	bidderSChain := w.sChainsByBidder[bidder]
+
+	// source should not be modified
+	if bidderSChain == nil && wildCardSChain == nil {
+		return
+	}
+
+	if bidderSChain != nil {
+		selectedSChain = bidderSChain
+	} else {
+		selectedSChain = wildCardSChain
+	}
+
+	if req.Source == nil {
+		req.Source = &openrtb2.Source{}
+	} else {
+		sourceCopy := *req.Source
+		req.Source = &sourceCopy
+	}
+	schain := openrtb_ext.ExtRequestPrebidSChain{
+		SChain: *selectedSChain,
+	}
+	sourceExt, err := json.Marshal(schain)
+	if err == nil {
+		req.Source.Ext = sourceExt
+	}
+}
+
+// extPrebidSChainExists checks if an schain exists in the ORTB 2.5 req.ext.prebid.schain location
+func extPrebidSChainExists(reqExt *openrtb_ext.ExtRequest) bool {
+	if reqExt == nil {
+		return false
+	}
+	if reqExt.Prebid.SChains == nil {
+		return false
+	}
+	return true
+}
diff --git a/schain/schainwriter_test.go b/schain/schainwriter_test.go
new file mode 100644
index 00000000000..92dc550d5e6
--- /dev/null
+++ b/schain/schainwriter_test.go
@@ -0,0 +1,182 @@
+package schain
+
+import (
+	"encoding/json"
+	"testing"
+
+	"github.com/mxmCherry/openrtb/v15/openrtb2"
+	"github.com/prebid/prebid-server/openrtb_ext"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestSChainWriter(t *testing.T) {
+
+	const seller1SChain string = `"schain":{"complete":1,"nodes":[{"asi":"directseller1.com","sid":"00001","rid":"BidRequest1","hp":1}],"ver":"1.0"}`
+	const seller2SChain string = `"schain":{"complete":2,"nodes":[{"asi":"directseller2.com","sid":"00002","rid":"BidRequest2","hp":2}],"ver":"2.0"}`
+	const seller3SChain string = `"schain":{"complete":3,"nodes":[{"asi":"directseller3.com","sid":"00003","rid":"BidRequest3","hp":3}],"ver":"3.0"}`
+	const sellerWildCardSChain string = `"schain":{"complete":1,"nodes":[{"asi":"wildcard1.com","sid":"wildcard1","rid":"WildcardReq1","hp":1}],"ver":"1.0"}`
+
+	tests := []struct {
+		description string
+		giveRequest openrtb2.BidRequest
+		giveBidder  string
+		wantRequest openrtb2.BidRequest
+		wantError   bool
+	}{
+		{
+			description: "nil source and nil ext.prebid.schains",
+			giveRequest: openrtb2.BidRequest{
+				Ext:    nil,
+				Source: nil,
+			},
+			giveBidder: "appnexus",
+			wantRequest: openrtb2.BidRequest{
+				Ext:    nil,
+				Source: nil,
+			},
+		},
+		{
+			description: "Use source schain -- no bidder schain or wildcard schain in nil ext.prebid.schains",
+			giveRequest: openrtb2.BidRequest{
+				Ext: json.RawMessage(`{}`),
+				Source: &openrtb2.Source{
+					Ext: json.RawMessage(`{` + seller2SChain + `}`),
+				},
+			},
+			giveBidder: "appnexus",
+			wantRequest: openrtb2.BidRequest{
+				Ext: json.RawMessage(`{}`),
+				Source: &openrtb2.Source{
+					Ext: json.RawMessage(`{` + seller2SChain + `}`),
+				},
+			},
+		},
+		{
+			description: "Use source schain -- no bidder schain or wildcard schain in not nil ext.prebid.schains",
+			giveRequest: openrtb2.BidRequest{
+				Ext: json.RawMessage(`{"prebid":{"schains":[{"bidders":["appnexus"],` + seller1SChain + `}]}}`),
+				Source: &openrtb2.Source{
+					Ext: json.RawMessage(`{` + seller2SChain + `}`),
+				},
+			},
+			giveBidder: "rubicon",
+			wantRequest: openrtb2.BidRequest{
+				Ext: json.RawMessage(`{"prebid":{"schains":[{"bidders":["appnexus"],` + seller1SChain + `}]}}`),
+				Source: &openrtb2.Source{
+					Ext: json.RawMessage(`{` + seller2SChain + `}`),
+				},
+			},
+		},
+		{
+			description: "Use schain for bidder in ext.prebid.schains; ensure other ext.source field values are retained.",
+			giveRequest: openrtb2.BidRequest{
+				Ext: json.RawMessage(`{"prebid":{"schains":[{"bidders":["appnexus"],` + seller1SChain + `}]}}`),
+				Source: &openrtb2.Source{
+					FD:     1,
+					TID:    "tid data",
+					PChain: "pchain data",
+					Ext:    json.RawMessage(`{` + seller2SChain + `}`),
+				},
+			},
+			giveBidder: "appnexus",
+			wantRequest: openrtb2.BidRequest{
+				Ext: json.RawMessage(`{"prebid":{"schains":[{"bidders":["appnexus"],` + seller1SChain + `}]}}`),
+				Source: &openrtb2.Source{
+					FD:     1,
+					TID:    "tid data",
+					PChain: "pchain data",
+					Ext:    json.RawMessage(`{` + seller1SChain + `}`),
+				},
+			},
+		},
+		{
+			description: "Use schain for bidder in ext.prebid.schains, nil req.source ",
+			giveRequest: openrtb2.BidRequest{
+				Ext:    json.RawMessage(`{"prebid":{"schains":[{"bidders":["appnexus"],` + seller1SChain + `}]}}`),
+				Source: nil,
+			},
+			giveBidder: "appnexus",
+			wantRequest: openrtb2.BidRequest{
+				Ext: json.RawMessage(`{"prebid":{"schains":[{"bidders":["appnexus"],` + seller1SChain + `}]}}`),
+				Source: &openrtb2.Source{
+					Ext: json.RawMessage(`{` + seller1SChain + `}`),
+				},
+			},
+		},
+		{
+			description: "Use wildcard schain in ext.prebid.schains.",
+			giveRequest: openrtb2.BidRequest{
+				Ext: json.RawMessage(`{"prebid":{"schains":[{"bidders":["*"],` + sellerWildCardSChain + `}]}}`),
+				Source: &openrtb2.Source{
+					Ext: nil,
+				},
+			},
+			giveBidder: "appnexus",
+			wantRequest: openrtb2.BidRequest{
+				Ext: json.RawMessage(`{"prebid":{"schains":[{"bidders":["*"],` + sellerWildCardSChain + `}]}}`),
+				Source: &openrtb2.Source{
+					Ext: json.RawMessage(`{` + sellerWildCardSChain + `}`),
+				},
+			},
+		},
+		{
+			description: "Use schain for bidder in ext.prebid.schains instead of wildcard.",
+			giveRequest: openrtb2.BidRequest{
+				Ext: json.RawMessage(`{"prebid":{"schains":[{"bidders":["appnexus"],` + seller1SChain + `},{"bidders":["*"],` + sellerWildCardSChain + `}]}}`),
+				Source: &openrtb2.Source{
+					Ext: nil,
+				},
+			},
+			giveBidder: "appnexus",
+			wantRequest: openrtb2.BidRequest{
+				Ext: json.RawMessage(`{"prebid":{"schains":[{"bidders":["appnexus"],` + seller1SChain + `},{"bidders":["*"],` + sellerWildCardSChain + `}]}}`),
+				Source: &openrtb2.Source{
+					Ext: json.RawMessage(`{` + seller1SChain + `}`),
+				},
+			},
+		},
+		{
+			description: "Use source schain -- multiple (two) bidder schains in ext.prebid.schains.",
+			giveRequest: openrtb2.BidRequest{
+				Ext: json.RawMessage(`{"prebid":{"schains":[{"bidders":["appnexus"],` + seller1SChain + `},{"bidders":["appnexus"],` + seller2SChain + `}]}}`),
+				Source: &openrtb2.Source{
+					Ext: json.RawMessage(`{` + seller3SChain + `}`),
+				},
+			},
+			giveBidder: "appnexus",
+			wantRequest: openrtb2.BidRequest{
+				Ext: json.RawMessage(`{"prebid":{"schains":[{"bidders":["appnexus"],` + seller1SChain + `},{"bidders":["appnexus"],` + seller2SChain + `}]}}`),
+				Source: &openrtb2.Source{
+					Ext: json.RawMessage(`{` + seller3SChain + `}`),
+				},
+			},
+			wantError: true,
+		},
+	}
+
+	for _, tt := range tests {
+		// unmarshal ext to get schains object needed to initialize writer
+		var reqExt *openrtb_ext.ExtRequest
+		if tt.giveRequest.Ext != nil {
+			reqExt = &openrtb_ext.ExtRequest{}
+			err := json.Unmarshal(tt.giveRequest.Ext, reqExt)
+			if err != nil {
+				t.Error("Unable to unmarshal request.ext")
+			}
+		}
+
+		writer, err := NewSChainWriter(reqExt)
+
+		if tt.wantError {
+			assert.NotNil(t, err)
+			assert.Nil(t, writer)
+		} else {
+			assert.Nil(t, err)
+			assert.NotNil(t, writer)
+
+			writer.Write(&tt.giveRequest, tt.giveBidder)
+
+			assert.Equal(t, tt.wantRequest, tt.giveRequest, tt.description)
+		}
+	}
+}
diff --git a/static/bidder-info/adyoulike.yaml b/static/bidder-info/adyoulike.yaml
index 0853cf1061b..8fdca5e23df 100644
--- a/static/bidder-info/adyoulike.yaml
+++ b/static/bidder-info/adyoulike.yaml
@@ -11,8 +11,8 @@ capabilities:
 userSync:
   default: iframe
   iframe:
-    url: "http://visitor.omnitagjs.com/visitor/isync?uid=19340f4f097d16f41f34fc0274981ca4&name=PrebidServer&gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&url={{.RedirectURL}}"
+    url: "https://visitor.omnitagjs.com/visitor/isync?uid=19340f4f097d16f41f34fc0274981ca4&name=PrebidServer&gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&url={{.RedirectURL}}"
     userMacro: "[BUYER_USERID]"
   redirect:
-    url: "http://visitor.omnitagjs.com/visitor/bsync?uid=19340f4f097d16f41f34fc0274981ca4&name=PrebidServer&gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&url={{.RedirectURL}}"
+    url: "https://visitor.omnitagjs.com/visitor/bsync?uid=19340f4f097d16f41f34fc0274981ca4&name=PrebidServer&gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&url={{.RedirectURL}}"
     userMacro: "[BUYER_USERID]"
diff --git a/static/bidder-info/apacdex.yaml b/static/bidder-info/apacdex.yaml
new file mode 100644
index 00000000000..2e8cd08f621
--- /dev/null
+++ b/static/bidder-info/apacdex.yaml
@@ -0,0 +1,20 @@
+maintainer:
+  email: "support@apacdex.com"
+modifyingVastXmlAllowed: false
+capabilities:
+  app:
+    mediaTypes:
+      - banner
+      - video
+  site:
+    mediaTypes:
+      - banner
+      - video
+userSync:
+  default: iframe
+  iframe:
+    url: https://sync.quantumdex.io/usersync/pbs?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&r={{.RedirectURL}}
+    userMacro: "[UID]"
+  redirect:
+    url: "https://sync.quantumdex.io/getuid?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&r={{.RedirectURL}}"
+    userMacro: "[UID]"
diff --git a/static/bidder-info/compass.yaml b/static/bidder-info/compass.yaml
new file mode 100644
index 00000000000..5944b27eb5a
--- /dev/null
+++ b/static/bidder-info/compass.yaml
@@ -0,0 +1,19 @@
+maintainer:
+  email: "sa-support@brightcom.com"
+gvlVendorID: 883
+capabilities:
+  site:
+    mediaTypes:
+    - banner
+    - video
+    - native
+    
+  app:
+    mediaTypes:
+    - banner
+    - video
+    - native
+userSync:
+  redirect:
+    url: "https://sa-cs.deliverimp.com/pserver?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&redir={{.RedirectURL}}"
+    userMacro: "[UID]"
diff --git a/static/bidder-info/quantumdex.yaml b/static/bidder-info/quantumdex.yaml
new file mode 100644
index 00000000000..2e8cd08f621
--- /dev/null
+++ b/static/bidder-info/quantumdex.yaml
@@ -0,0 +1,20 @@
+maintainer:
+  email: "support@apacdex.com"
+modifyingVastXmlAllowed: false
+capabilities:
+  app:
+    mediaTypes:
+      - banner
+      - video
+  site:
+    mediaTypes:
+      - banner
+      - video
+userSync:
+  default: iframe
+  iframe:
+    url: https://sync.quantumdex.io/usersync/pbs?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&r={{.RedirectURL}}
+    userMacro: "[UID]"
+  redirect:
+    url: "https://sync.quantumdex.io/getuid?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&r={{.RedirectURL}}"
+    userMacro: "[UID]"
diff --git a/static/bidder-info/valueimpression.yaml b/static/bidder-info/valueimpression.yaml
index 0782f897f2a..2e8cd08f621 100644
--- a/static/bidder-info/valueimpression.yaml
+++ b/static/bidder-info/valueimpression.yaml
@@ -1,5 +1,6 @@
 maintainer:
-  email: "info@valueimpression.com"
+  email: "support@apacdex.com"
+modifyingVastXmlAllowed: false
 capabilities:
   app:
     mediaTypes:
@@ -10,6 +11,10 @@ capabilities:
       - banner
       - video
 userSync:
+  default: iframe
+  iframe:
+    url: https://sync.quantumdex.io/usersync/pbs?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&r={{.RedirectURL}}
+    userMacro: "[UID]"
   redirect:
-    url: "https://rtb.valueimpression.com/usersync?gdpr={{.GDPR}}&consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&redirect={{.RedirectURL}}"
-    userMacro: "$UID"
+    url: "https://sync.quantumdex.io/getuid?gdpr={{.GDPR}}&gdpr_consent={{.GDPRConsent}}&us_privacy={{.USPrivacy}}&r={{.RedirectURL}}"
+    userMacro: "[UID]"
diff --git a/static/bidder-params/apacdex.json b/static/bidder-params/apacdex.json
new file mode 100644
index 00000000000..0130fcee1c7
--- /dev/null
+++ b/static/bidder-params/apacdex.json
@@ -0,0 +1,32 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Apacdex Adapter Params",
+  "description": "A schema which validates params accepted by the Apacdex adapter",
+  "type": "object",
+  "properties": {
+    "placementId": {
+      "type": "string",
+      "description": "Placement ID provided by Apacdex"
+    },
+    "siteId": {
+      "type": "string",
+      "description": "Publisher site ID from Apacdex"
+    },
+    "floorPrice": {
+      "type": "number",
+      "description": "CPM bidfloor in USD"
+    }
+  },
+  "oneOf": [
+    {
+      "required": [
+        "placementId"
+      ]
+    },
+    {
+      "required": [
+        "siteId"
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/static/bidder-params/compass.json b/static/bidder-params/compass.json
new file mode 100644
index 00000000000..11fcbf31ea4
--- /dev/null
+++ b/static/bidder-params/compass.json
@@ -0,0 +1,23 @@
+{
+    "$schema": "http://json-schema.org/draft-04/schema#",
+    "title": "Compass Adapter Params",
+    "description": "A schema which validates params accepted by the Compass adapter",
+    "type": "object",
+  
+    "properties": {
+      "placementId": {
+        "type": "string",
+        "minLength": 1,
+        "description": "Placement ID"
+      },
+      "endpointId": {
+        "type": "string",
+        "minLength": 1,
+        "description": "Endpoint ID"
+      }
+    },
+    "oneOf": [
+      { "required": ["placementId"] },
+      { "required": ["endpointId"] }
+    ]
+  }
\ No newline at end of file
diff --git a/static/bidder-params/quantumdex.json b/static/bidder-params/quantumdex.json
new file mode 100644
index 00000000000..3ef9abe34c6
--- /dev/null
+++ b/static/bidder-params/quantumdex.json
@@ -0,0 +1,32 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Quantumdex Adapter Params",
+  "description": "A schema which validates params accepted by the Quantumdex adapter",
+  "type": "object",
+  "properties": {
+    "placementId": {
+      "type": "string",
+      "description": "Placement ID provided by Quantumdex"
+    },
+    "siteId": {
+      "type": "string",
+      "description": "Publisher site ID from Quantumdex"
+    },
+    "floorPrice": {
+      "type": "number",
+      "description": "CPM bidfloor in USD"
+    }
+  },
+  "oneOf": [
+    {
+      "required": [
+        "placementId"
+      ]
+    },
+    {
+      "required": [
+        "siteId"
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/static/bidder-params/rubicon.json b/static/bidder-params/rubicon.json
index a2ba22820b8..a9635665c71 100644
--- a/static/bidder-params/rubicon.json
+++ b/static/bidder-params/rubicon.json
@@ -5,17 +5,29 @@
   "type": "object",
   "properties": {
     "accountId": {
-      "type": "integer",
+      "type": [
+        "integer",
+        "string"
+      ],
+      "pattern": "^\\d+$",
       "minimum": 1,
       "description": "An ID which identifies the publisher's account"
     },
     "siteId": {
-      "type": "integer",
+      "type": [
+        "integer",
+        "string"
+      ],
+      "pattern": "^\\d+$",
       "minimum": 1,
       "description": "An ID which identifies the site selling the impression"
     },
     "zoneId": {
-      "type": "integer",
+      "type": [
+        "integer",
+        "string"
+      ],
+      "pattern": "^\\d+$",
       "minimum": 1,
       "description": "An ID which identifies the sub-section of the site where the impression is located"
     },
@@ -33,6 +45,10 @@
         "type": "array"
       }
     },
+    "pchain": {
+      "type": "string",
+      "description": "A payment ID chain string"
+    },
     "video": {
       "type": "object",
       "description": "An object defining additional Rubicon video parameters",
@@ -42,11 +58,11 @@
           "description": "Language of the ad - should match content video"
         },
         "playerHeight": {
-          "type": "integer",
+          "type": ["integer", "string"],
           "description": "Height in pixels of the video player"
         },
         "playerWidth": {
-          "type": "integer",
+          "type": ["integer", "string"],
           "description": "Width in pixels of the video player"
         },
         "size_id": {
@@ -55,7 +71,7 @@
         },
         "skip": {
           "type": "integer",
-          "description": "Can this ad be skipped ( 0 = no, 1 = yes)"
+          "description": "Can this ad be skipped (0 = no, 1 = yes)"
         },
         "skipdelay": {
           "type": "integer",
@@ -64,5 +80,9 @@
       }
     }
   },
-  "required": ["accountId", "siteId", "zoneId"]
-}
+  "required": [
+    "accountId",
+    "siteId",
+    "zoneId"
+  ]
+}
\ No newline at end of file
diff --git a/static/bidder-params/valueimpression.json b/static/bidder-params/valueimpression.json
index 5b9c32c592e..793e940eb11 100644
--- a/static/bidder-params/valueimpression.json
+++ b/static/bidder-params/valueimpression.json
@@ -1,15 +1,32 @@
-
 {
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "title": "ValueImpression Adapter Params",
-    "description": "Schema to validate params accepted by the ValueImpression adapter",
-  
-    "type": "object",
-    "properties": {
-      "siteId": {
-        "type": "string",
-        "description": "Site ID"
-      }
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Valueimpression Adapter Params",
+  "description": "A schema which validates params accepted by the Valueimpression adapter",
+  "type": "object",
+  "properties": {
+    "placementId": {
+      "type": "string",
+      "description": "Placement ID provided by Valueimpression"
     },
-    "required": ["siteId"]
-  }
+    "siteId": {
+      "type": "string",
+      "description": "Publisher site ID from Valueimpression"
+    },
+    "floorPrice": {
+      "type": "number",
+      "description": "CPM bidfloor in USD"
+    }
+  },
+  "oneOf": [
+    {
+      "required": [
+        "placementId"
+      ]
+    },
+    {
+      "required": [
+        "siteId"
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/stored_requests/backends/db_fetcher/fetcher.go b/stored_requests/backends/db_fetcher/fetcher.go
index d8cf132d25b..1ad64a3ca3f 100644
--- a/stored_requests/backends/db_fetcher/fetcher.go
+++ b/stored_requests/backends/db_fetcher/fetcher.go
@@ -4,30 +4,34 @@ import (
 	"context"
 	"database/sql"
 	"encoding/json"
-
 	"github.com/lib/pq"
 
 	"github.com/golang/glog"
 	"github.com/prebid/prebid-server/stored_requests"
 )
 
-func NewFetcher(db *sql.DB, queryMaker func(int, int) string) stored_requests.AllFetcher {
+func NewFetcher(db *sql.DB, queryMaker func(int, int) string, responseQueryMaker func(int) string) stored_requests.AllFetcher {
 	if db == nil {
 		glog.Fatalf("The Postgres Stored Request Fetcher requires a database connection. Please report this as a bug.")
 	}
 	if queryMaker == nil {
 		glog.Fatalf("The Postgres Stored Request Fetcher requires a queryMaker function. Please report this as a bug.")
 	}
+	if responseQueryMaker == nil {
+		glog.Fatalf("The Postgres Stored Response Fetcher requires a responseQueryMaker function. Please report this as a bug.")
+	}
 	return &dbFetcher{
-		db:         db,
-		queryMaker: queryMaker,
+		db:                 db,
+		queryMaker:         queryMaker,
+		responseQueryMaker: responseQueryMaker,
 	}
 }
 
 // dbFetcher fetches Stored Requests from a database. This should be instantiated through the NewFetcher() function.
 type dbFetcher struct {
-	db         *sql.DB
-	queryMaker func(numReqs int, numImps int) (query string)
+	db                 *sql.DB
+	queryMaker         func(numReqs int, numImps int) (query string)
+	responseQueryMaker func(numIds int) (query string)
 }
 
 func (fetcher *dbFetcher) FetchRequests(ctx context.Context, requestIDs []string, impIDs []string) (map[string]json.RawMessage, map[string]json.RawMessage, []error) {
@@ -93,6 +97,47 @@ func (fetcher *dbFetcher) FetchRequests(ctx context.Context, requestIDs []string
 	return storedRequestData, storedImpData, errs
 }
 
+func (fetcher *dbFetcher) FetchResponses(ctx context.Context, ids []string) (data map[string]json.RawMessage, errs []error) {
+	if len(ids) < 1 {
+		return nil, nil
+	}
+
+	query := fetcher.responseQueryMaker(len(ids))
+	idInterfaces := make([]interface{}, len(ids))
+	for i := 0; i < len(ids); i++ {
+		idInterfaces[i] = ids[i]
+	}
+
+	rows, err := fetcher.db.QueryContext(ctx, query, idInterfaces...)
+	if err != nil {
+		return nil, []error{err}
+	}
+	defer func() {
+		if err := rows.Close(); err != nil {
+			glog.Errorf("error closing DB connection: %v", err)
+		}
+	}()
+
+	storedData := make(map[string]json.RawMessage, len(ids))
+	for rows.Next() {
+		var id string
+		var data []byte
+		var dataType string
+
+		if err := rows.Scan(&id, &data, &dataType); err != nil {
+			return nil, []error{err}
+		}
+		storedData[id] = data
+	}
+
+	if rows.Err() != nil {
+		return nil, []error{rows.Err()}
+	}
+
+	return storedData, errs
+
+}
+
 func (fetcher *dbFetcher) FetchAccount(ctx context.Context, accountID string) (json.RawMessage, []error) {
 	return nil, []error{stored_requests.NotFoundError{accountID, "Account"}}
 }
diff --git a/stored_requests/backends/db_fetcher/fetcher_test.go b/stored_requests/backends/db_fetcher/fetcher_test.go
index 7d6decd2602..8959736dbbb 100644
--- a/stored_requests/backends/db_fetcher/fetcher_test.go
+++ b/stored_requests/backends/db_fetcher/fetcher_test.go
@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"github.com/DATA-DOG/go-sqlmock"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestEmptyQuery(t *testing.T) {
@@ -21,13 +22,18 @@ func TestEmptyQuery(t *testing.T) {
 	defer db.Close()
 
 	fetcher := dbFetcher{
-		db:         db,
-		queryMaker: successfulQueryMaker(""),
+		db:                 db,
+		queryMaker:         successfulQueryMaker(""),
+		responseQueryMaker: successfulResponseQueryMaker(""),
 	}
 	storedReqs, storedImps, errs := fetcher.FetchRequests(context.Background(), nil, nil)
 	assertErrorCount(t, 0, errs)
 	assertMapLength(t, 0, storedReqs)
 	assertMapLength(t, 0, storedImps)
+
+	storedResponses, errs := fetcher.FetchResponses(context.Background(), nil)
+	assertErrorCount(t, 0, errs)
+	assertMapLength(t, 0, storedResponses)
 }
 
 // TestGoodResponse makes sure we interpret DB responses properly when all the stored requests are there.
@@ -52,6 +58,61 @@ func TestGoodResponse(t *testing.T) {
 	assertHasData(t, storedImps, "imp-id-2", `{"imp":true,"value":2}`)
 }
 
+func TestFetchResponses(t *testing.T) {
+	testCases := []struct {
+		description  string
+		mockQuery    string
+		mockReturn   *sqlmock.Rows
+		arguments    []driver.Value
+		respIds      []string
+		expectedResp map[string]string
+	}{
+		{
+			description: "fetch good response",
+			mockQuery:   "SELECT id, data, 'response' AS dataType FROM responses_table WHERE id IN (?, ?)",
+			mockReturn: sqlmock.NewRows([]string{"id", "data", "dataType"}).
+				AddRow("resp-id-1", `{"resp":false,"value":1}`, "response").
+				AddRow("resp-id-2", `{"resp":true,"value":2}`, "response"),
+			arguments:    []driver.Value{"resp-id-1", "resp-id-2"},
+			respIds:      []string{"resp-id-1", "resp-id-2"},
+			expectedResp: map[string]string{"resp-id-1": `{"resp":false,"value":1}`, "resp-id-2": `{"resp":true,"value":2}`},
+		},
+		{
+			description: "fetch partial response",
+			mockQuery:   "SELECT id, data, 'response' AS dataType FROM responses_table WHERE id IN (?, ?)",
+			mockReturn: sqlmock.NewRows([]string{"id", "data", "dataType"}).
+				AddRow("stored-resp-id", "{}", "response"),
+			arguments:    []driver.Value{"stored-resp-id", "stored-resp-id-2"},
+			respIds:      []string{"stored-resp-id", "stored-resp-id-2"},
+			expectedResp: map[string]string{"stored-resp-id": `{}`},
+		},
+		{
+			description:  "fetch empty response",
+			mockQuery:    "SELECT id, data, dataType FROM my_table WHERE id IN (?, ?)",
+			mockReturn:   sqlmock.NewRows([]string{"id", "data", "dataType"}),
+			arguments:    []driver.Value{"stored-resp-id", "stored-resp-id-2"},
+			respIds:      []string{"stored-resp-id", "stored-resp-id-2"},
+			expectedResp: map[string]string{},
+		},
+	}
+
+	for _, test := range testCases {
+		mock, fetcher := newFetcher(t, test.mockReturn, test.mockQuery, test.arguments...)
+		defer fetcher.db.Close()
+
+		storedResponses, errs := fetcher.FetchResponses(context.Background(), test.respIds)
+
+		assertMockExpectations(t, mock)
+		assertErrorCount(t, 0, errs)
+		assert.Len(t, storedResponses, len(test.expectedResp))
+
+		for k, v := range test.expectedResp {
+			assertHasData(t, storedResponses, k, v)
+		}
+
+	}
+}
+
 // TestPartialResponse makes sure we unpack things properly when the DB finds some of the stored requests.
 func TestPartialResponse(t *testing.T) {
 	mockQuery := "SELECT id, data, 'request' AS dataType FROM req_table WHERE id IN (?, ?) UNION ALL SELECT id, data, 'imp' as dataType FROM imp_table WHERE id IN (NULL)"
@@ -116,16 +177,22 @@ func TestContextDeadlines(t *testing.T) {
 	mock.ExpectQuery(".*").WillDelayFor(2 * time.Minute)
 
 	fetcher := &dbFetcher{
-		db:         db,
-		queryMaker: successfulQueryMaker("SELECT id, requestData FROM my_table WHERE id IN (?, ?)"),
+		db:                 db,
+		queryMaker:         successfulQueryMaker("SELECT id, requestData FROM my_table WHERE id IN (?, ?)"),
+		responseQueryMaker: successfulResponseQueryMaker("SELECT id, responseData FROM my_table WHERE id IN (?, ?)"),
 	}
 
 	ctx, cancel := context.WithTimeout(context.Background(), 1*time.Nanosecond)
 	defer cancel()
+
 	_, _, errs := fetcher.FetchRequests(ctx, []string{"id"}, nil)
 	if len(errs) < 1 {
 		t.Errorf("dbFetcher should return an error when the context times out.")
 	}
+	_, errs = fetcher.FetchResponses(ctx, []string{"id"})
+	if len(errs) < 1 {
+		t.Errorf("dbFetcher should return an error when the context times out.")
+	}
 }
 
 // TestContextCancelled makes sure a hung query returns when the context is cancelled.
@@ -138,8 +205,9 @@ func TestContextCancelled(t *testing.T) {
 	mock.ExpectQuery(".*").WillDelayFor(2 * time.Minute)
 
 	fetcher := &dbFetcher{
-		db:         db,
-		queryMaker: successfulQueryMaker("SELECT id, requestData FROM my_table WHERE id IN (?, ?)"),
+		db:                 db,
+		queryMaker:         successfulQueryMaker("SELECT id, requestData FROM my_table WHERE id IN (?, ?)"),
+		responseQueryMaker: successfulResponseQueryMaker("SELECT id, responseData FROM my_table WHERE id IN (?, ?)"),
 	}
 
 	ctx, cancel := context.WithCancel(context.Background())
@@ -148,6 +216,10 @@ func TestContextCancelled(t *testing.T) {
 	if len(errs) < 1 {
 		t.Errorf("dbFetcher should return an error when the context is cancelled.")
 	}
+	_, errs = fetcher.FetchResponses(ctx, []string{"id"})
+	if len(errs) < 1 {
+		t.Errorf("dbFetcher should return an error when the context is cancelled.")
+	}
 }
 
 // Prevents #338
@@ -173,6 +245,29 @@ func TestRowErrors(t *testing.T) {
 	assertMapLength(t, 0, data)
 }
 
+func TestRowErrorsFetchResponses(t *testing.T) {
+	db, mock, err := sqlmock.New()
+	if err != nil {
+		t.Fatalf("Failed to create mock: %v", err)
+	}
+	rows := sqlmock.NewRows([]string{"id", "data", "dataType"})
+	rows.AddRow("foo", []byte(`{"data":1}`), "response")
+	rows.AddRow("bar", []byte(`{"data":2}`), "response")
+	rows.RowError(1, errors.New("Error reading from row 1"))
+	mock.ExpectQuery(".*").WillReturnRows(rows)
+	fetcher := &dbFetcher{
+		db:                 db,
+		queryMaker:         successfulQueryMaker("SELECT id, data, dataType FROM my_table WHERE id IN (?)"),
+		responseQueryMaker: successfulResponseQueryMaker("SELECT id, data, dataType FROM my_table WHERE id IN (?)"),
+	}
+	data, errs := fetcher.FetchResponses(context.Background(), []string{"foo", "bar"})
+	assertErrorCount(t, 1, errs)
+	if errs[0].Error() != "Error reading from row 1" {
+		t.Errorf("Unexpected error message: %v", errs[0].Error())
+	}
+	assertMapLength(t, 0, data)
+}
+
 func newFetcher(t *testing.T, rows *sqlmock.Rows, query string, args ...driver.Value) (sqlmock.Sqlmock, *dbFetcher) {
 	db, mock, err := sqlmock.New()
 	if err != nil {
@@ -183,8 +278,9 @@ func newFetcher(t *testing.T, rows *sqlmock.Rows, query string, args ...driver.V
 	queryRegex := fmt.Sprintf("^%s$", regexp.QuoteMeta(query))
 	mock.ExpectQuery(queryRegex).WithArgs(args...).WillReturnRows(rows)
 	fetcher := &dbFetcher{
-		db:         db,
-		queryMaker: successfulQueryMaker(query),
+		db:                 db,
+		queryMaker:         successfulQueryMaker(query),
+		responseQueryMaker: successfulResponseQueryMaker(query),
 	}
 
 	return mock, fetcher
@@ -227,3 +323,9 @@ func successfulQueryMaker(response string) func(int, int) string {
 		return response
 	}
 }
+
+func successfulResponseQueryMaker(response string) func(int) string {
+	return func(numIds int) string {
+		return response
+	}
+}
diff --git a/stored_requests/backends/empty_fetcher/fetcher.go b/stored_requests/backends/empty_fetcher/fetcher.go
index ee6b98b3b2e..715a27089b0 100644
--- a/stored_requests/backends/empty_fetcher/fetcher.go
+++ b/stored_requests/backends/empty_fetcher/fetcher.go
@@ -28,6 +28,10 @@ func (fetcher EmptyFetcher) FetchRequests(ctx context.Context, requestIDs []stri
 	return
 }
 
+func (fetcher EmptyFetcher) FetchResponses(ctx context.Context, ids []string) (data map[string]json.RawMessage, errs []error) {
+	return nil, nil
+}
+
 func (fetcher EmptyFetcher) FetchAccount(ctx context.Context, accountID string) (json.RawMessage, []error) {
 	return nil, []error{stored_requests.NotFoundError{accountID, "Account"}}
 }
diff --git a/stored_requests/backends/file_fetcher/fetcher.go b/stored_requests/backends/file_fetcher/fetcher.go
index 2d3b00657b9..56677e264d9 100644
--- a/stored_requests/backends/file_fetcher/fetcher.go
+++ b/stored_requests/backends/file_fetcher/fetcher.go
@@ -33,6 +33,10 @@ func (fetcher *eagerFetcher) FetchRequests(ctx context.Context, requestIDs []str
 	return storedRequests, storedImpressions, errs
 }
 
+func (fetcher *eagerFetcher) FetchResponses(ctx context.Context, ids []string) (data map[string]json.RawMessage, errs []error) {
+	return nil, nil
+}
+
 // FetchAccount fetches the host account configuration for a publisher
 func (fetcher *eagerFetcher) FetchAccount(ctx context.Context, accountID string) (json.RawMessage, []error) {
 	if len(accountID) == 0 {
diff --git a/stored_requests/backends/http_fetcher/fetcher.go b/stored_requests/backends/http_fetcher/fetcher.go
index 75a92e3f331..70fcf51f83b 100644
--- a/stored_requests/backends/http_fetcher/fetcher.go
+++ b/stored_requests/backends/http_fetcher/fetcher.go
@@ -96,6 +96,10 @@ func (fetcher *HttpFetcher) FetchRequests(ctx context.Context, requestIDs []stri
 	return
 }
 
+func (fetcher *HttpFetcher) FetchResponses(ctx context.Context, ids []string) (data map[string]json.RawMessage, errs []error) {
+	return nil, nil
+}
+
 // FetchAccounts retrieves account configurations
 //
 // Request format is similar to the one for requests:
diff --git a/stored_requests/config/config.go b/stored_requests/config/config.go
index 89022582ace..f091126800a 100644
--- a/stored_requests/config/config.go
+++ b/stored_requests/config/config.go
@@ -107,11 +107,13 @@ func CreateStoredRequests(cfg *config.StoredRequests, metricsEngine metrics.Metr
 //
 // As a side-effect, it will add some endpoints to the router if the config calls for it.
 // In the future we should look for ways to simplify this so that it's not doing two things.
-func NewStoredRequests(cfg *config.Configuration, metricsEngine metrics.MetricsEngine, client *http.Client, router *httprouter.Router) (shutdown func(), fetcher stored_requests.Fetcher, ampFetcher stored_requests.Fetcher, accountsFetcher stored_requests.AccountFetcher, categoriesFetcher stored_requests.CategoryFetcher, videoFetcher stored_requests.Fetcher) {
-	// TODO: Switch this to be set in config defaults
-	//if cfg.CategoryMapping.CacheEvents.Enabled && cfg.CategoryMapping.CacheEvents.Endpoint == "" {
-	//	cfg.CategoryMapping.CacheEvents.Endpoint = "/storedrequest/categorymapping"
-	//}
+func NewStoredRequests(cfg *config.Configuration, metricsEngine metrics.MetricsEngine, client *http.Client, router *httprouter.Router) (shutdown func(),
+	fetcher stored_requests.Fetcher,
+	ampFetcher stored_requests.Fetcher,
+	accountsFetcher stored_requests.AccountFetcher,
+	categoriesFetcher stored_requests.CategoryFetcher,
+	videoFetcher stored_requests.Fetcher,
+	storedRespFetcher stored_requests.Fetcher) {
 
 	var dbc dbConnection
 
@@ -120,12 +122,14 @@ func NewStoredRequests(cfg *config.Configuration, metricsEngine metrics.MetricsE
 	fetcher3, shutdown3 := CreateStoredRequests(&cfg.CategoryMapping, metricsEngine, client, router, &dbc)
 	fetcher4, shutdown4 := CreateStoredRequests(&cfg.StoredVideo, metricsEngine, client, router, &dbc)
 	fetcher5, shutdown5 := CreateStoredRequests(&cfg.Accounts, metricsEngine, client, router, &dbc)
+	fetcher6, shutdown6 := CreateStoredRequests(&cfg.StoredResponses, metricsEngine, client, router, &dbc)
 
 	fetcher = fetcher1.(stored_requests.Fetcher)
 	ampFetcher = fetcher2.(stored_requests.Fetcher)
 	categoriesFetcher = fetcher3.(stored_requests.CategoryFetcher)
 	videoFetcher = fetcher4.(stored_requests.Fetcher)
 	accountsFetcher = fetcher5.(stored_requests.AccountFetcher)
+	storedRespFetcher = fetcher6.(stored_requests.Fetcher)
 
 	shutdown = func() {
 		shutdown1()
@@ -133,6 +137,7 @@ func NewStoredRequests(cfg *config.Configuration, metricsEngine metrics.MetricsE
 		shutdown3()
 		shutdown4()
 		shutdown5()
+		shutdown6()
 	}
 
 	return
@@ -163,7 +168,7 @@ func newFetcher(cfg *config.StoredRequests, client *http.Client, db *sql.DB) (fe
 	}
 	if cfg.Postgres.FetcherQueries.QueryTemplate != "" {
 		glog.Infof("Loading Stored %s data via Postgres.\nQuery: %s", cfg.DataType(), cfg.Postgres.FetcherQueries.QueryTemplate)
-		idList = append(idList, db_fetcher.NewFetcher(db, cfg.Postgres.FetcherQueries.MakeQuery))
+		idList = append(idList, db_fetcher.NewFetcher(db, cfg.Postgres.FetcherQueries.MakeQuery, cfg.Postgres.FetcherQueries.MakeQueryResponses))
 	} else if cfg.Postgres.CacheInitialization.Query != "" && cfg.Postgres.PollUpdates.Query != "" {
 		//in this case data will be loaded to cache via poll for updates event
 		idList = append(idList, empty_fetcher.EmptyFetcher{})
@@ -178,7 +183,12 @@ func newFetcher(cfg *config.StoredRequests, client *http.Client, db *sql.DB) (fe
 }
 
 func newCache(cfg *config.StoredRequests) stored_requests.Cache {
-	cache := stored_requests.Cache{&nil_cache.NilCache{}, &nil_cache.NilCache{}, &nil_cache.NilCache{}}
+	cache := stored_requests.Cache{
+		Requests:  &nil_cache.NilCache{},
+		Imps:      &nil_cache.NilCache{},
+		Responses: &nil_cache.NilCache{},
+		Accounts:  &nil_cache.NilCache{},
+	}
 	switch {
 	case cfg.InMemoryCache.Type == "none":
 		glog.Warningf("No %s cache configured. The %s Fetcher backend will be used for all data requests", cfg.DataType(), cfg.DataType())
@@ -187,6 +197,7 @@ func newCache(cfg *config.StoredRequests) stored_requests.Cache {
 	default:
 		cache.Requests = memory.NewCache(cfg.InMemoryCache.RequestCacheSize, cfg.InMemoryCache.TTL, "Requests")
 		cache.Imps = memory.NewCache(cfg.InMemoryCache.ImpCacheSize, cfg.InMemoryCache.TTL, "Imps")
+		cache.Responses = memory.NewCache(cfg.InMemoryCache.RespCacheSize, cfg.InMemoryCache.TTL, "Responses")
 	}
 	return cache
 }
diff --git a/stored_requests/config/config_test.go b/stored_requests/config/config_test.go
index 4a8d10a9382..7cf6c38af0c 100644
--- a/stored_requests/config/config_test.go
+++ b/stored_requests/config/config_test.go
@@ -158,6 +158,7 @@ func TestNewEmptyCache(t *testing.T) {
 	cache := newCache(&config.StoredRequests{InMemoryCache: config.InMemoryCache{Type: "none"}})
 	assert.True(t, isEmptyCacheType(cache.Requests), "The newCache method should return an empty Request cache")
 	assert.True(t, isEmptyCacheType(cache.Imps), "The newCache method should return an empty Imp cache")
+	assert.True(t, isEmptyCacheType(cache.Responses), "The newCache method should return an empty Responses cache")
 	assert.True(t, isEmptyCacheType(cache.Accounts), "The newCache method should return an empty Account cache")
 }
 
@@ -167,10 +168,12 @@ func TestNewInMemoryCache(t *testing.T) {
 			TTL:              60,
 			RequestCacheSize: 100,
 			ImpCacheSize:     100,
+			RespCacheSize:    100,
 		},
 	})
 	assert.True(t, isMemoryCacheType(cache.Requests), "The newCache method should return an in-memory Request cache for StoredRequests config")
 	assert.True(t, isMemoryCacheType(cache.Imps), "The newCache method should return an in-memory Imp cache for StoredRequests config")
+	assert.True(t, isMemoryCacheType(cache.Responses), "The newCache method should return an in-memory Responses cache for StoredResponses config")
 	assert.True(t, isEmptyCacheType(cache.Accounts), "The newCache method should return an empty Account cache for StoredRequests config")
 }
 
@@ -184,6 +187,7 @@ func TestNewInMemoryAccountCache(t *testing.T) {
 	assert.True(t, isMemoryCacheType(cache.Accounts), "The newCache method should return an in-memory Account cache for Accounts config")
 	assert.True(t, isEmptyCacheType(cache.Requests), "The newCache method should return an empty Request cache for Accounts config")
 	assert.True(t, isEmptyCacheType(cache.Imps), "The newCache method should return an empty Imp cache for Accounts config")
+	assert.True(t, isEmptyCacheType(cache.Responses), "The newCache method should return an empty Responses cache for Accounts config")
 }
 
 func TestNewPostgresEventProducers(t *testing.T) {
diff --git a/stored_requests/events/api/api_test.go b/stored_requests/events/api/api_test.go
index cd3af77bd83..67ba836cb00 100644
--- a/stored_requests/events/api/api_test.go
+++ b/stored_requests/events/api/api_test.go
@@ -16,15 +16,17 @@ import (
 
 func TestGoodRequests(t *testing.T) {
 	cache := stored_requests.Cache{
-		Requests: memory.NewCache(256*1024, -1, "Request"),
-		Imps:     memory.NewCache(256*1024, -1, "Imp"),
-		Accounts: memory.NewCache(256*1024, -1, "Account"),
+		Requests:  memory.NewCache(256*1024, -1, "Request"),
+		Imps:      memory.NewCache(256*1024, -1, "Imp"),
+		Responses: memory.NewCache(256*1024, -1, "Responses"),
+		Accounts:  memory.NewCache(256*1024, -1, "Account"),
 	}
 	id := "1"
 	config := fmt.Sprintf(`{"id": "%s"}`, id)
 	initialValue := map[string]json.RawMessage{id: json.RawMessage(config)}
 	cache.Requests.Save(context.Background(), initialValue)
 	cache.Imps.Save(context.Background(), initialValue)
+	cache.Responses.Save(context.Background(), initialValue)
 
 	apiEvents, endpoint := NewEventsAPI()
 
@@ -40,7 +42,7 @@ func TestGoodRequests(t *testing.T) {
 	defer listener.Stop()
 
 	config = fmt.Sprintf(`{"id": "%s", "updated": true}`, id)
-	update := fmt.Sprintf(`{"requests": {"%s": %s}, "imps": {"%s": %s}}`, id, config, id, config)
+	update := fmt.Sprintf(`{"requests": {"%s": %s}, "imps": {"%s": %s}, "responses": {"%s": %s}}`, id, config, id, config, id, config)
 	request := newRequest("POST", update)
 
 	recorder := httptest.NewRecorder()
@@ -53,10 +55,12 @@ func TestGoodRequests(t *testing.T) {
 	<-updateOccurred
 	reqData := cache.Requests.Get(context.Background(), []string{id})
 	impData := cache.Imps.Get(context.Background(), []string{id})
+	respData := cache.Responses.Get(context.Background(), []string{id})
 	assertHasValue(t, reqData, id, config)
 	assertHasValue(t, impData, id, config)
+	assertHasValue(t, respData, id, config)
 
-	invalidation := fmt.Sprintf(`{"requests": ["%s"], "imps": ["%s"]}`, id, id)
+	invalidation := fmt.Sprintf(`{"requests": ["%s"], "imps": ["%s"], "responses": ["%s"]}`, id, id, id)
 	request = newRequest("DELETE", invalidation)
 
 	recorder = httptest.NewRecorder()
@@ -69,14 +73,17 @@ func TestGoodRequests(t *testing.T) {
 	<-invalidateOccurred
 	reqData = cache.Requests.Get(context.Background(), []string{id})
 	impData = cache.Imps.Get(context.Background(), []string{id})
+	respData = cache.Responses.Get(context.Background(), []string{id})
 	assertMapLength(t, 0, reqData)
 	assertMapLength(t, 0, impData)
+	assertMapLength(t, 0, respData)
 }
 
 func TestBadRequests(t *testing.T) {
 	cache := stored_requests.Cache{
-		Requests: memory.NewCache(256*1024, -1, "Requests"),
-		Imps:     memory.NewCache(256*1024, -1, "Imps"),
+		Requests:  memory.NewCache(256*1024, -1, "Requests"),
+		Imps:      memory.NewCache(256*1024, -1, "Imps"),
+		Responses: memory.NewCache(256*1024, -1, "Responses"),
 	}
 	apiEvents, endpoint := NewEventsAPI()
 	listener := events.SimpleEventListener()
diff --git a/stored_requests/events/events.go b/stored_requests/events/events.go
index 7cb8f4b9b6d..725df4279d8 100644
--- a/stored_requests/events/events.go
+++ b/stored_requests/events/events.go
@@ -9,16 +9,18 @@ import (
 
 // Save represents a bulk save
 type Save struct {
-	Requests map[string]json.RawMessage `json:"requests"`
-	Imps     map[string]json.RawMessage `json:"imps"`
-	Accounts map[string]json.RawMessage `json:"accounts"`
+	Requests  map[string]json.RawMessage `json:"requests"`
+	Imps      map[string]json.RawMessage `json:"imps"`
+	Accounts  map[string]json.RawMessage `json:"accounts"`
+	Responses map[string]json.RawMessage `json:"responses"`
 }
 
 // Invalidation represents a bulk invalidation
 type Invalidation struct {
-	Requests []string `json:"requests"`
-	Imps     []string `json:"imps"`
-	Accounts []string `json:"accounts"`
+	Requests  []string `json:"requests"`
+	Imps      []string `json:"imps"`
+	Accounts  []string `json:"accounts"`
+	Responses []string `json:"responses"`
 }
 
 // EventProducer will produce cache update and invalidation events on its channels
@@ -66,6 +68,7 @@ func (e *EventListener) Listen(cache stored_requests.Cache, events EventProducer
 			cache.Requests.Save(context.Background(), save.Requests)
 			cache.Imps.Save(context.Background(), save.Imps)
 			cache.Accounts.Save(context.Background(), save.Accounts)
+			cache.Responses.Save(context.Background(), save.Responses)
 			if e.onSave != nil {
 				e.onSave()
 			}
@@ -73,6 +76,7 @@ func (e *EventListener) Listen(cache stored_requests.Cache, events EventProducer
 			cache.Requests.Invalidate(context.Background(), invalidation.Requests)
 			cache.Imps.Invalidate(context.Background(), invalidation.Imps)
 			cache.Accounts.Invalidate(context.Background(), invalidation.Accounts)
+			cache.Responses.Invalidate(context.Background(), invalidation.Responses)
 			if e.onInvalidate != nil {
 				e.onInvalidate()
 			}
diff --git a/stored_requests/events/events_test.go b/stored_requests/events/events_test.go
index c943dd69b55..580f1eddf37 100644
--- a/stored_requests/events/events_test.go
+++ b/stored_requests/events/events_test.go
@@ -17,9 +17,10 @@ func TestListen(t *testing.T) {
 		invalidations: make(chan Invalidation),
 	}
 	cache := stored_requests.Cache{
-		Requests: memory.NewCache(256*1024, -1, "Requests"),
-		Imps:     memory.NewCache(256*1024, -1, "Imps"),
-		Accounts: memory.NewCache(256*1024, -1, "Account"),
+		Requests:  memory.NewCache(256*1024, -1, "Requests"),
+		Imps:      memory.NewCache(256*1024, -1, "Imps"),
+		Responses: memory.NewCache(256*1024, -1, "Responses"),
+		Accounts:  memory.NewCache(256*1024, -1, "Account"),
 	}
 
 	// create channels to synchronize
@@ -38,9 +39,10 @@ func TestListen(t *testing.T) {
 	config := fmt.Sprintf(`{"id": "%s"}`, id)
 	data := map[string]json.RawMessage{id: json.RawMessage(config)}
 	save := Save{
-		Requests: data,
-		Imps:     data,
-		Accounts: data,
+		Requests:  data,
+		Imps:      data,
+		Responses: data,
+		Accounts:  data,
 	}
 	cache.Requests.Save(context.Background(), save.Requests)
 	cache.Imps.Save(context.Background(), save.Imps)
@@ -49,9 +51,10 @@ func TestListen(t *testing.T) {
 	config = fmt.Sprintf(`{"id": "%s", "updated": true}`, id)
 	data = map[string]json.RawMessage{id: json.RawMessage(config)}
 	save = Save{
-		Requests: data,
-		Imps:     data,
-		Accounts: data,
+		Requests:  data,
+		Imps:      data,
+		Responses: data,
+		Accounts:  data,
 	}
 
 	ep.saves <- save
@@ -59,15 +62,17 @@ func TestListen(t *testing.T) {
 
 	requestData := cache.Requests.Get(context.Background(), idSlice)
 	impData := cache.Imps.Get(context.Background(), idSlice)
+	respData := cache.Responses.Get(context.Background(), idSlice)
 	accountData := cache.Accounts.Get(context.Background(), idSlice)
-	if !reflect.DeepEqual(requestData, data) || !reflect.DeepEqual(impData, data) || !reflect.DeepEqual(accountData, data) {
+	if !reflect.DeepEqual(requestData, data) || !reflect.DeepEqual(impData, data) || !reflect.DeepEqual(respData, data) || !reflect.DeepEqual(accountData, data) {
 		t.Error("Update failed")
 	}
 
 	invalidation := Invalidation{
-		Requests: idSlice,
-		Imps:     idSlice,
-		Accounts: idSlice,
+		Requests:  idSlice,
+		Imps:      idSlice,
+		Responses: idSlice,
+		Accounts:  idSlice,
 	}
 
 	ep.invalidations <- invalidation
@@ -75,8 +80,9 @@ func TestListen(t *testing.T) {
 
 	requestData = cache.Requests.Get(context.Background(), idSlice)
 	impData = cache.Imps.Get(context.Background(), idSlice)
+	respData = cache.Responses.Get(context.Background(), idSlice)
 	accountData = cache.Accounts.Get(context.Background(), idSlice)
-	if len(requestData) > 0 || len(impData) > 0 || len(accountData) > 0 {
+	if len(requestData) > 0 || len(impData) > 0 || len(respData) > 0 || len(accountData) > 0 {
 		t.Error("Invalidate failed")
 	}
 }
diff --git a/stored_requests/events/http/http.go b/stored_requests/events/http/http.go
index 4615183f693..6450e0de2a0 100644
--- a/stored_requests/events/http/http.go
+++ b/stored_requests/events/http/http.go
@@ -40,6 +40,10 @@ import (
 //   "imps": {
 //     "imp1": { ... stored data for imp1 ... },
 //     "imp2": { ... stored data for imp2 ... },
+//   },
+//   "responses": {
+//     "resp1": { ... stored data for resp1 ... },
+//     "resp2": { ... stored data for resp2 ... },
 //   }
 // }
 // or
@@ -89,11 +93,12 @@ func (e *HTTPEvents) fetchAll() {
 	defer cancel()
 	resp, err := ctxhttp.Get(ctx, e.client, e.Endpoint)
 	if respObj, ok := e.parse(e.Endpoint, resp, err); ok &&
-		(len(respObj.StoredRequests) > 0 || len(respObj.StoredImps) > 0 || len(respObj.Accounts) > 0) {
+		(len(respObj.StoredRequests) > 0 || len(respObj.StoredImps) > 0 || len(respObj.StoredResponses) > 0 || len(respObj.Accounts) > 0) {
 		e.saves <- events.Save{
-			Requests: respObj.StoredRequests,
-			Imps:     respObj.StoredImps,
-			Accounts: respObj.Accounts,
+			Requests:  respObj.StoredRequests,
+			Imps:      respObj.StoredImps,
+			Responses: respObj.StoredResponses,
+			Accounts:  respObj.Accounts,
 		}
 	}
 }
@@ -131,18 +136,20 @@ func (e *HTTPEvents) refresh(ticker <-chan time.Time) {
 			resp, err := ctxhttp.Get(ctx, e.client, endpoint)
 			if respObj, ok := e.parse(endpoint, resp, err); ok {
 				invalidations := events.Invalidation{
-					Requests: extractInvalidations(respObj.StoredRequests),
-					Imps:     extractInvalidations(respObj.StoredImps),
-					Accounts: extractInvalidations(respObj.Accounts),
+					Requests:  extractInvalidations(respObj.StoredRequests),
+					Imps:      extractInvalidations(respObj.StoredImps),
+					Responses: extractInvalidations(respObj.StoredResponses),
+					Accounts:  extractInvalidations(respObj.Accounts),
 				}
-				if len(respObj.StoredRequests) > 0 || len(respObj.StoredImps) > 0 || len(respObj.Accounts) > 0 {
+				if len(respObj.StoredRequests) > 0 || len(respObj.StoredImps) > 0 || len(respObj.StoredResponses) > 0 || len(respObj.Accounts) > 0 {
 					e.saves <- events.Save{
-						Requests: respObj.StoredRequests,
-						Imps:     respObj.StoredImps,
-						Accounts: respObj.Accounts,
+						Requests:  respObj.StoredRequests,
+						Imps:      respObj.StoredImps,
+						Responses: respObj.StoredResponses,
+						Accounts:  respObj.Accounts,
 					}
 				}
-				if len(invalidations.Requests) > 0 || len(invalidations.Imps) > 0 || len(invalidations.Accounts) > 0 {
+				if len(invalidations.Requests) > 0 || len(invalidations.Imps) > 0 || len(invalidations.Responses) > 0 || len(invalidations.Accounts) > 0 {
 					e.invalidations <- invalidations
 				}
 				e.lastUpdate = thisTimeInUTC
@@ -201,7 +208,8 @@ func (e *HTTPEvents) Invalidations() <-chan events.Invalidation {
 }
 
 type responseContract struct {
-	StoredRequests map[string]json.RawMessage `json:"requests"`
-	StoredImps     map[string]json.RawMessage `json:"imps"`
-	Accounts       map[string]json.RawMessage `json:"accounts"`
+	StoredRequests  map[string]json.RawMessage `json:"requests"`
+	StoredImps      map[string]json.RawMessage `json:"imps"`
+	StoredResponses map[string]json.RawMessage `json:"responses"`
+	Accounts        map[string]json.RawMessage `json:"accounts"`
 }
diff --git a/stored_requests/events/http/http_test.go b/stored_requests/events/http/http_test.go
index 2a1aa5d8dfc..a185a3c2360 100644
--- a/stored_requests/events/http/http_test.go
+++ b/stored_requests/events/http/http_test.go
@@ -34,7 +34,7 @@ func TestStartup(t *testing.T) {
 				{
 					statusCode: httpCore.StatusOK,
 					response:   `{"requests": {"request1": {"value":1}, "request2": {"value":2}}}`,
-					saves:      `{"requests": {"request1": {"value":1}, "request2": {"value":2}}, "imps": null, "accounts": null}`,
+					saves:      `{"requests": {"request1": {"value":1}, "request2": {"value":2}}, "imps": null, "responses": null,  "accounts": null}`,
 				},
 			},
 		},
@@ -44,23 +44,33 @@ func TestStartup(t *testing.T) {
 				{
 					statusCode: httpCore.StatusOK,
 					response:   `{"imps": {"imp1": {"value":1}}}`,
-					saves:      `{"imps": {"imp1": {"value":1}}, "requests": null, "accounts": null}`,
+					saves:      `{"imps": {"imp1": {"value":1}}, "requests": null, "responses": null, "accounts": null}`,
 				},
 			},
 		},
 		{
-			description: "Load requests and imps then update",
+			description: "Load responses at startup",
 			tests: []testStep{
 				{
 					statusCode: httpCore.StatusOK,
-					response:   `{"requests": {"request1": {"value":1}, "request2": {"value":2}}, "imps": {"imp1": {"value":3}, "imp2": {"value":4}}}`,
-					saves:      `{"requests": {"request1": {"value":1}, "request2": {"value":2}}, "imps": {"imp1": {"value":3}, "imp2": {"value":4}}, "accounts":null}`,
+					response:   `{"responses": {"resp1": {"value":1}}}`,
+					saves:      `{"responses": {"resp1": {"value":1}}, "imps": null, "requests": null, "accounts": null}`,
+				},
+			},
+		},
+		{
+			description: "Load requests imps and responses then update",
+			tests: []testStep{
+				{
+					statusCode: httpCore.StatusOK,
+					response:   `{"requests": {"request1": {"value":1}, "request2": {"value":2}}, "imps": {"imp1": {"value":3}, "imp2": {"value":4}}, "responses": {"resp1": {"value":5}, "resp2": {"value":6}}}`,
+					saves:      `{"requests": {"request1": {"value":1}, "request2": {"value":2}}, "imps": {"imp1": {"value":3}, "imp2": {"value":4}}, "responses": {"resp1": {"value":5}, "resp2": {"value":6}}, "accounts":null}`,
 				},
 				{
 					statusCode:    httpCore.StatusOK,
-					response:      `{"requests": {"request1": {"value":5}, "request2": {"deleted":true}}, "imps": {"imp1": {"deleted":true}, "imp2": {"value":6}}}`,
-					saves:         `{"requests": {"request1": {"value":5}}, "imps": {"imp2": {"value":6}}, "accounts":null}`,
-					invalidations: `{"requests": ["request2"], "imps": ["imp1"], "accounts": []}`,
+					response:      `{"requests": {"request1": {"value":7}, "request2": {"deleted":true}}, "imps": {"imp1": {"deleted":true}, "imp2": {"value":8}}, "responses": {"resp1": {"deleted":true}, "resp2": {"value":9}}}`,
+					saves:         `{"requests": {"request1": {"value":7}}, "imps": {"imp2": {"value":8}}, "responses": {"resp2": {"value":9}}, "accounts":null}`,
+					invalidations: `{"requests": ["request2"], "imps": ["imp1"], "responses": ["resp1"], "accounts": []}`,
 				},
 			},
 		},
@@ -70,13 +80,13 @@ func TestStartup(t *testing.T) {
 				{
 					statusCode: httpCore.StatusOK,
 					response:   `{"accounts":{"account1":{"value":1}, "account2":{"value":2}}}`,
-					saves:      `{"accounts":{"account1":{"value":1}, "account2":{"value":2}}, "imps": null, "requests": null}`,
+					saves:      `{"accounts":{"account1":{"value":1}, "account2":{"value":2}}, "imps": null, "requests": null, "responses": null}`,
 				},
 				{
 					statusCode:    httpCore.StatusOK,
 					response:      `{"accounts":{"account1":{"value":5}, "account2":{"deleted": true}}}`,
-					saves:         `{"accounts":{"account1":{"value":5}}, "imps": null, "requests": null}`,
-					invalidations: `{"accounts":["account2"], "requests": [], "imps": []}`,
+					saves:         `{"accounts":{"account1":{"value":5}}, "imps": null, "requests": null, "responses": null}`,
+					invalidations: `{"accounts":["account2"], "requests": [], "imps": [], "responses":[]}`,
 				},
 			},
 		},
diff --git a/stored_requests/events/postgres/database.go b/stored_requests/events/postgres/database.go
index e769a55585c..a666fae5106 100644
--- a/stored_requests/events/postgres/database.go
+++ b/stored_requests/events/postgres/database.go
@@ -170,9 +170,11 @@ func (e *PostgresEventProducer) recordError(errorType metrics.StoredDataError) {
 func (e *PostgresEventProducer) sendEvents(rows *sql.Rows) (err error) {
 	storedRequestData := make(map[string]json.RawMessage)
 	storedImpData := make(map[string]json.RawMessage)
+	storedRespData := make(map[string]json.RawMessage)
 
 	var requestInvalidations []string
 	var impInvalidations []string
+	var respInvalidations []string
 
 	for rows.Next() {
 		var id string
@@ -197,6 +199,12 @@ func (e *PostgresEventProducer) sendEvents(rows *sql.Rows) (err error) {
 			} else {
 				storedImpData[id] = data
 			}
+		case "response":
+			if len(data) == 0 || bytes.Equal(data, bytesNull()) {
+				respInvalidations = append(respInvalidations, id)
+			} else {
+				storedRespData[id] = data
+			}
 		default:
 			glog.Warningf("Stored Data with id=%s has invalid type: %s. This will be ignored.", id, dataType)
 		}
@@ -207,17 +215,19 @@ func (e *PostgresEventProducer) sendEvents(rows *sql.Rows) (err error) {
 		return rows.Err()
 	}
 
-	if len(storedRequestData) > 0 || len(storedImpData) > 0 {
+	if len(storedRequestData) > 0 || len(storedImpData) > 0 || len(storedRespData) > 0 {
 		e.saves <- events.Save{
-			Requests: storedRequestData,
-			Imps:     storedImpData,
+			Requests:  storedRequestData,
+			Imps:      storedImpData,
+			Responses: storedRespData,
 		}
 	}
 
-	if (len(requestInvalidations) > 0 || len(impInvalidations) > 0) && !e.lastUpdate.IsZero() {
+	if (len(requestInvalidations) > 0 || len(impInvalidations) > 0 || len(respInvalidations) > 0) && !e.lastUpdate.IsZero() {
 		e.invalidations <- events.Invalidation{
-			Requests: requestInvalidations,
-			Imps:     impInvalidations,
+			Requests:  requestInvalidations,
+			Imps:      impInvalidations,
+			Responses: respInvalidations,
 		}
 	}
 
diff --git a/stored_requests/events/postgres/database_test.go b/stored_requests/events/postgres/database_test.go
index 15d0fbffbc3..c3dfa0ae70e 100644
--- a/stored_requests/events/postgres/database_test.go
+++ b/stored_requests/events/postgres/database_test.go
@@ -33,14 +33,16 @@ func fakeQueryRegex() string {
 
 func TestFetchAllSuccess(t *testing.T) {
 	tests := []struct {
-		description         string
-		giveFakeTime        time.Time
-		giveMockRows        *sqlmock.Rows
-		wantLastUpdate      time.Time
-		wantSavedReqs       map[string]json.RawMessage
-		wantSavedImps       map[string]json.RawMessage
-		wantInvalidatedReqs []string
-		wantInvalidatedImps []string
+		description          string
+		giveFakeTime         time.Time
+		giveMockRows         *sqlmock.Rows
+		wantLastUpdate       time.Time
+		wantSavedReqs        map[string]json.RawMessage
+		wantSavedImps        map[string]json.RawMessage
+		wantSavedResps       map[string]json.RawMessage
+		wantInvalidatedReqs  []string
+		wantInvalidatedImps  []string
+		wantInvalidatedResps []string
 	}{
 		{
 			description:    "saved reqs = 0, saved imps = 0, invalidated reqs = 0, invalidated imps = 0",
@@ -49,44 +51,64 @@ func TestFetchAllSuccess(t *testing.T) {
 			wantLastUpdate: time.Date(2020, time.July, 1, 12, 30, 0, 0, time.UTC),
 		},
 		{
-			description:    "saved reqs > 0, saved imps = 0, invalidated reqs = 0, invalidated imps = 0",
+			description:    "saved reqs > 0, saved imps = 0, saved resps = 0, invalidated reqs = 0, invalidated imps = 0, invalidated resps = 0",
 			giveFakeTime:   time.Date(2020, time.July, 1, 12, 30, 0, 0, time.UTC),
 			giveMockRows:   sqlmock.NewRows([]string{"id", "data", "dataType"}).AddRow("req-1", "true", "request"),
 			wantLastUpdate: time.Date(2020, time.July, 1, 12, 30, 0, 0, time.UTC),
 			wantSavedReqs:  map[string]json.RawMessage{"req-1": json.RawMessage(`true`)},
 			wantSavedImps:  map[string]json.RawMessage{},
+			wantSavedResps: map[string]json.RawMessage{},
 		},
 		{
-			description:    "saved reqs = 0, saved imps > 0, invalidated reqs = 0, invalidated imps = 0",
+			description:    "saved reqs = 0, saved imps > 0, saved resps = 0, invalidated reqs = 0, invalidated imps = 0, invalidated resps = 0",
 			giveFakeTime:   time.Date(2020, time.July, 1, 12, 30, 0, 0, time.UTC),
 			giveMockRows:   sqlmock.NewRows([]string{"id", "data", "dataType"}).AddRow("imp-1", "true", "imp"),
 			wantLastUpdate: time.Date(2020, time.July, 1, 12, 30, 0, 0, time.UTC),
 			wantSavedReqs:  map[string]json.RawMessage{},
 			wantSavedImps:  map[string]json.RawMessage{"imp-1": json.RawMessage(`true`)},
+			wantSavedResps: map[string]json.RawMessage{},
 		},
 		{
-			description:    "saved reqs = 0, saved imps = 0, invalidated reqs > 0, invalidated imps = 0",
+			description:    "saved reqs = 0, saved imps = 0, saved responses > 0, invalidated reqs = 0, invalidated imps = 0, invalidated responses = 0",
+			giveFakeTime:   time.Date(2020, time.July, 1, 12, 30, 0, 0, time.UTC),
+			giveMockRows:   sqlmock.NewRows([]string{"id", "data", "dataType"}).AddRow("resp-1", "true", "response"),
+			wantLastUpdate: time.Date(2020, time.July, 1, 12, 30, 0, 0, time.UTC),
+			wantSavedReqs:  map[string]json.RawMessage{},
+			wantSavedImps:  map[string]json.RawMessage{},
+			wantSavedResps: map[string]json.RawMessage{"resp-1": json.RawMessage(`true`)},
+		},
+		{
+			description:    "saved reqs = 0, saved imps = 0, saved responses = 0, invalidated reqs > 0, invalidated imps = 0, invalidated responses = 0",
 			giveFakeTime:   time.Date(2020, time.July, 1, 12, 30, 0, 0, time.UTC),
 			giveMockRows:   sqlmock.NewRows([]string{"id", "data", "dataType"}).AddRow("req-1", "", "request"),
 			wantLastUpdate: time.Date(2020, time.July, 1, 12, 30, 0, 0, time.UTC),
 		},
 		{
-			description:    "saved reqs = 0, saved imps = 0, invalidated reqs = 0, invalidated imps > 0",
+			description:    "saved reqs = 0, saved imps = 0, saved responses = 0, invalidated reqs = 0, invalidated imps > 0, invalidated responses = 0",
 			giveFakeTime:   time.Date(2020, time.July, 1, 12, 30, 0, 0, time.UTC),
 			giveMockRows:   sqlmock.NewRows([]string{"id", "data", "dataType"}).AddRow("imp-1", "", "imp"),
 			wantLastUpdate: time.Date(2020, time.July, 1, 12, 30, 0, 0, time.UTC),
 		},
 		{
-			description:  "saved reqs > 0, saved imps > 0, invalidated reqs > 0, invalidated imps > 0",
+			description:    "saved reqs = 0, saved imps = 0, saved responses = 0, invalidated reqs = 0, invalidated imps = 0, invalidated responses > 0",
+			giveFakeTime:   time.Date(2020, time.July, 1, 12, 30, 0, 0, time.UTC),
+			giveMockRows:   sqlmock.NewRows([]string{"id", "data", "dataType"}).AddRow("resp-1", "", "response"),
+			wantLastUpdate: time.Date(2020, time.July, 1, 12, 30, 0, 0, time.UTC),
+		},
+		{
+			description:  "saved reqs > 0, saved imps > 0, saved responses > 0, invalidated reqs > 0, invalidated imps > 0, invalidated responses > 0",
 			giveFakeTime: time.Date(2020, time.July, 1, 12, 30, 0, 0, time.UTC),
 			giveMockRows: sqlmock.NewRows([]string{"id", "data", "dataType"}).
 				AddRow("req-1", "true", "request").
 				AddRow("imp-1", "true", "imp").
 				AddRow("req-2", "", "request").
-				AddRow("imp-2", "", "imp"),
+				AddRow("imp-2", "", "imp").
+				AddRow("resp-1", "true", "response").
+				AddRow("resp-2", "", "response"),
 			wantLastUpdate: time.Date(2020, time.July, 1, 12, 30, 0, 0, time.UTC),
 			wantSavedReqs:  map[string]json.RawMessage{"req-1": json.RawMessage(`true`)},
 			wantSavedImps:  map[string]json.RawMessage{"imp-1": json.RawMessage(`true`)},
+			wantSavedResps: map[string]json.RawMessage{"resp-1": json.RawMessage(`true`)},
 		},
 	}
 
@@ -128,8 +150,10 @@ func TestFetchAllSuccess(t *testing.T) {
 
 		assert.Equal(t, tt.wantSavedReqs, saves.Requests, tt.description)
 		assert.Equal(t, tt.wantSavedImps, saves.Imps, tt.description)
+		assert.Equal(t, tt.wantSavedResps, saves.Responses, tt.description)
 		assert.Equal(t, tt.wantInvalidatedReqs, invalidations.Requests, tt.description)
 		assert.Equal(t, tt.wantInvalidatedImps, invalidations.Imps, tt.description)
+		assert.Equal(t, tt.wantInvalidatedResps, invalidations.Responses, tt.description)
 
 		metricsMock.AssertExpectations(t)
 	}
@@ -217,8 +241,10 @@ func TestFetchAllErrors(t *testing.T) {
 
 		assert.Nil(t, saves.Requests, tt.description)
 		assert.Nil(t, saves.Imps, tt.description)
+		assert.Nil(t, saves.Responses, tt.description)
 		assert.Nil(t, invalidations.Requests, tt.description)
-		assert.Nil(t, invalidations.Requests, tt.description)
+		assert.Nil(t, invalidations.Imps, tt.description)
+		assert.Nil(t, invalidations.Responses, tt.description)
 
 		metricsMock.AssertExpectations(t)
 	}
@@ -226,80 +252,99 @@ func TestFetchAllErrors(t *testing.T) {
 
 func TestFetchDeltaSuccess(t *testing.T) {
 	tests := []struct {
-		description         string
-		giveFakeTime        time.Time
-		giveMockRows        *sqlmock.Rows
-		wantLastUpdate      time.Time
-		wantSavedReqs       map[string]json.RawMessage
-		wantSavedImps       map[string]json.RawMessage
-		wantInvalidatedReqs []string
-		wantInvalidatedImps []string
+		description          string
+		giveFakeTime         time.Time
+		giveMockRows         *sqlmock.Rows
+		wantLastUpdate       time.Time
+		wantSavedReqs        map[string]json.RawMessage
+		wantSavedImps        map[string]json.RawMessage
+		wantSavedResps       map[string]json.RawMessage
+		wantInvalidatedReqs  []string
+		wantInvalidatedImps  []string
+		wantInvalidatedResps []string
 	}{
 		{
-			description:    "saved reqs = 0, saved imps = 0, invalidated reqs = 0, invalidated imps = 0",
+			description:    "saved reqs = 0, saved imps = 0, saved resps = 0, invalidated reqs = 0, invalidated imps = 0, invalidated resps = 0",
 			giveFakeTime:   time.Date(2020, time.July, 1, 12, 30, 0, 0, time.UTC),
 			giveMockRows:   sqlmock.NewRows([]string{"id", "data", "dataType"}),
 			wantLastUpdate: time.Date(2020, time.July, 1, 12, 30, 0, 0, time.UTC),
 		},
 		{
-			description:    "saved reqs > 0, saved imps = 0, invalidated reqs = 0, invalidated imps = 0",
+			description:    "saved reqs > 0, saved imps = 0, saved resps = 0, invalidated reqs = 0, invalidated imps = 0, invalidated resps = 0",
 			giveFakeTime:   time.Date(2020, time.July, 1, 12, 30, 0, 0, time.UTC),
 			giveMockRows:   sqlmock.NewRows([]string{"id", "data", "dataType"}).AddRow("req-1", "true", "request"),
 			wantLastUpdate: time.Date(2020, time.July, 1, 12, 30, 0, 0, time.UTC),
 			wantSavedReqs:  map[string]json.RawMessage{"req-1": json.RawMessage(`true`)},
 			wantSavedImps:  map[string]json.RawMessage{},
+			wantSavedResps: map[string]json.RawMessage{},
 		},
 		{
-			description:    "saved reqs = 0, saved imps > 0, invalidated reqs = 0, invalidated imps = 0",
+			description:    "saved reqs = 0, saved imps > 0, saved resps = 0, invalidated reqs = 0, invalidated imps = 0, invalidated resps = 0",
 			giveFakeTime:   time.Date(2020, time.July, 1, 12, 30, 0, 0, time.UTC),
 			giveMockRows:   sqlmock.NewRows([]string{"id", "data", "dataType"}).AddRow("imp-1", "true", "imp"),
 			wantLastUpdate: time.Date(2020, time.July, 1, 12, 30, 0, 0, time.UTC),
 			wantSavedReqs:  map[string]json.RawMessage{},
 			wantSavedImps:  map[string]json.RawMessage{"imp-1": json.RawMessage(`true`)},
+			wantSavedResps: map[string]json.RawMessage{},
 		},
 		{
-			description:         "saved reqs = 0, saved imps = 0, invalidated reqs > 0, invalidated imps = 0, empty data",
-			giveFakeTime:        time.Date(2020, time.July, 1, 12, 30, 0, 0, time.UTC),
-			giveMockRows:        sqlmock.NewRows([]string{"id", "data", "dataType"}).AddRow("req-1", "", "request"),
-			wantLastUpdate:      time.Date(2020, time.July, 1, 12, 30, 0, 0, time.UTC),
-			wantInvalidatedReqs: []string{"req-1"},
-			wantInvalidatedImps: nil,
+			description:    "saved reqs = 0, saved imps = 0, saved resps > 0, invalidated reqs = 0, invalidated imps = 0, invalidated resps = 0",
+			giveFakeTime:   time.Date(2020, time.July, 1, 12, 30, 0, 0, time.UTC),
+			giveMockRows:   sqlmock.NewRows([]string{"id", "data", "dataType"}).AddRow("resp-1", "true", "response"),
+			wantLastUpdate: time.Date(2020, time.July, 1, 12, 30, 0, 0, time.UTC),
+			wantSavedReqs:  map[string]json.RawMessage{},
+			wantSavedImps:  map[string]json.RawMessage{},
+			wantSavedResps: map[string]json.RawMessage{"resp-1": json.RawMessage(`true`)},
 		},
 		{
-			description:         "saved reqs = 0, saved imps = 0, invalidated reqs > 0, invalidated imps = 0, null data",
-			giveFakeTime:        time.Date(2020, time.July, 1, 12, 30, 0, 0, time.UTC),
-			giveMockRows:        sqlmock.NewRows([]string{"id", "data", "dataType"}).AddRow("req-1", "null", "request"),
-			wantLastUpdate:      time.Date(2020, time.July, 1, 12, 30, 0, 0, time.UTC),
-			wantInvalidatedReqs: []string{"req-1"},
-			wantInvalidatedImps: nil,
+			description:          "saved reqs = 0, saved imps = 0, saved resps = 0, invalidated reqs > 0, invalidated imps = 0, invalidated resps = 0, empty data",
+			giveFakeTime:         time.Date(2020, time.July, 1, 12, 30, 0, 0, time.UTC),
+			giveMockRows:         sqlmock.NewRows([]string{"id", "data", "dataType"}).AddRow("req-1", "", "request"),
+			wantLastUpdate:       time.Date(2020, time.July, 1, 12, 30, 0, 0, time.UTC),
+			wantInvalidatedReqs:  []string{"req-1"},
+			wantInvalidatedImps:  nil,
+			wantInvalidatedResps: nil,
+		},
+		{
+			description:          "saved reqs = 0, saved imps = 0, saved resps = 0, invalidated reqs = 0, invalidated imps = 0, invalidated resps > 0, null data",
+			giveFakeTime:         time.Date(2020, time.July, 1, 12, 30, 0, 0, time.UTC),
+			giveMockRows:         sqlmock.NewRows([]string{"id", "data", "dataType"}).AddRow("resp-1", "null", "response"),
+			wantLastUpdate:       time.Date(2020, time.July, 1, 12, 30, 0, 0, time.UTC),
+			wantInvalidatedReqs:  nil,
+			wantInvalidatedImps:  nil,
+			wantInvalidatedResps: []string{"resp-1"},
 		},
 		{
-			description:         "saved reqs = 0, saved imps = 0, invalidated reqs = 0, invalidated imps > 0, empty data",
+			description:         "saved reqs = 0, saved imps = 0, saved resps = 0, invalidated reqs = 0, invalidated imps > 0, invalidated resps = 0, empty data",
 			giveFakeTime:        time.Date(2020, time.July, 1, 12, 30, 0, 0, time.UTC),
 			giveMockRows:        sqlmock.NewRows([]string{"id", "data", "dataType"}).AddRow("imp-1", "", "imp"),
 			wantLastUpdate:      time.Date(2020, time.July, 1, 12, 30, 0, 0, time.UTC),
 			wantInvalidatedImps: []string{"imp-1"},
 		},
 		{
-			description:         "saved reqs = 0, saved imps = 0, invalidated reqs = 0, invalidated imps > 0, null data",
+			description:         "saved reqs = 0, saved imps = 0, saved resps = 0, invalidated reqs = 0, invalidated imps > 0, invalidated resps = 0, null data",
 			giveFakeTime:        time.Date(2020, time.July, 1, 12, 30, 0, 0, time.UTC),
 			giveMockRows:        sqlmock.NewRows([]string{"id", "data", "dataType"}).AddRow("imp-1", "null", "imp"),
 			wantLastUpdate:      time.Date(2020, time.July, 1, 12, 30, 0, 0, time.UTC),
 			wantInvalidatedImps: []string{"imp-1"},
 		},
 		{
-			description:  "saved reqs > 0, saved imps > 0, invalidated reqs > 0, invalidated imps > 0",
+			description:  "saved reqs > 0, saved imps > 0, saved resps > 0, invalidated reqs > 0, invalidated imps > 0, invalidated resps > 0",
 			giveFakeTime: time.Date(2020, time.July, 1, 12, 30, 0, 0, time.UTC),
 			giveMockRows: sqlmock.NewRows([]string{"id", "data", "dataType"}).
 				AddRow("req-1", "true", "request").
 				AddRow("imp-1", "true", "imp").
+				AddRow("resps-1", "true", "response").
 				AddRow("req-2", "", "request").
-				AddRow("imp-2", "", "imp"),
-			wantLastUpdate:      time.Date(2020, time.July, 1, 12, 30, 0, 0, time.UTC),
-			wantSavedReqs:       map[string]json.RawMessage{"req-1": json.RawMessage(`true`)},
-			wantSavedImps:       map[string]json.RawMessage{"imp-1": json.RawMessage(`true`)},
-			wantInvalidatedReqs: []string{"req-2"},
-			wantInvalidatedImps: []string{"imp-2"},
+				AddRow("imp-2", "", "imp").
+				AddRow("resps-2", "", "response"),
+			wantLastUpdate:       time.Date(2020, time.July, 1, 12, 30, 0, 0, time.UTC),
+			wantSavedReqs:        map[string]json.RawMessage{"req-1": json.RawMessage(`true`)},
+			wantSavedImps:        map[string]json.RawMessage{"imp-1": json.RawMessage(`true`)},
+			wantSavedResps:       map[string]json.RawMessage{"resps-1": json.RawMessage(`true`)},
+			wantInvalidatedReqs:  []string{"req-2"},
+			wantInvalidatedImps:  []string{"imp-2"},
+			wantInvalidatedResps: []string{"resps-2"},
 		},
 	}
 
@@ -342,8 +387,10 @@ func TestFetchDeltaSuccess(t *testing.T) {
 
 		assert.Equal(t, tt.wantSavedReqs, saves.Requests, tt.description)
 		assert.Equal(t, tt.wantSavedImps, saves.Imps, tt.description)
+		assert.Equal(t, tt.wantSavedResps, saves.Responses, tt.description)
 		assert.Equal(t, tt.wantInvalidatedReqs, invalidations.Requests, tt.description)
 		assert.Equal(t, tt.wantInvalidatedImps, invalidations.Imps, tt.description)
+		assert.Equal(t, tt.wantInvalidatedResps, invalidations.Responses, tt.description)
 
 		metricsMock.AssertExpectations(t)
 	}
@@ -436,8 +483,10 @@ func TestFetchDeltaErrors(t *testing.T) {
 
 		assert.Nil(t, saves.Requests, tt.description)
 		assert.Nil(t, saves.Imps, tt.description)
+		assert.Nil(t, saves.Responses, tt.description)
 		assert.Nil(t, invalidations.Requests, tt.description)
-		assert.Nil(t, invalidations.Requests, tt.description)
+		assert.Nil(t, invalidations.Imps, tt.description)
+		assert.Nil(t, invalidations.Responses, tt.description)
 
 		metricsMock.AssertExpectations(t)
 	}
diff --git a/stored_requests/fetcher.go b/stored_requests/fetcher.go
index 865231ee757..b1b4d2cf565 100644
--- a/stored_requests/fetcher.go
+++ b/stored_requests/fetcher.go
@@ -23,6 +23,7 @@ type Fetcher interface {
 	//
 	// The returned objects can only be read from. They may not be written to.
 	FetchRequests(ctx context.Context, requestIDs []string, impIDs []string) (requestData map[string]json.RawMessage, impData map[string]json.RawMessage, errs []error)
+	FetchResponses(ctx context.Context, ids []string) (data map[string]json.RawMessage, errs []error)
 }
 
 type AccountFetcher interface {
@@ -63,9 +64,10 @@ func (e NotFoundError) Error() string {
 // Implementations must be safe for concurrent access by multiple goroutines.
 // To add a Cache layer in front of a Fetcher, see WithCache()
 type Cache struct {
-	Requests CacheJSON
-	Imps     CacheJSON
-	Accounts CacheJSON
+	Requests  CacheJSON
+	Imps      CacheJSON
+	Responses CacheJSON
+	Accounts  CacheJSON
 }
 type CacheJSON interface {
 	// Get works much like Fetcher.FetchRequests, with a few exceptions:
@@ -191,6 +193,23 @@ func (f *fetcherWithCache) FetchRequests(ctx context.Context, requestIDs []strin
 	return
 }
 
+func (f *fetcherWithCache) FetchResponses(ctx context.Context, ids []string) (data map[string]json.RawMessage, errs []error) {
+	data = f.cache.Responses.Get(ctx, ids)
+
+	leftoverResp := findLeftovers(ids, data)
+
+	if len(leftoverResp) > 0 {
+		fetcherRespData, fetcherErrs := f.fetcher.FetchResponses(ctx, leftoverResp)
+		errs = fetcherErrs
+
+		f.cache.Responses.Save(ctx, fetcherRespData)
+
+		data = mergeData(data, fetcherRespData)
+	}
+
+	return
+}
+
 func (f *fetcherWithCache) FetchAccount(ctx context.Context, accountID string) (account json.RawMessage, errs []error) {
 	accountData := f.cache.Accounts.Get(ctx, []string{accountID})
 	// TODO: add metrics
diff --git a/stored_requests/fetcher_test.go b/stored_requests/fetcher_test.go
index e77bc75c310..4c0ed47c85a 100644
--- a/stored_requests/fetcher_test.go
+++ b/stored_requests/fetcher_test.go
@@ -13,20 +13,22 @@ import (
 	"github.com/stretchr/testify/mock"
 )
 
-func setupFetcherWithCacheDeps() (*mockCache, *mockCache, *mockFetcher, AllFetcher, *metrics.MetricsEngineMock) {
+func setupFetcherWithCacheDeps() (*mockCache, *mockCache, *mockCache, *mockFetcher, AllFetcher, *metrics.MetricsEngineMock) {
 	reqCache := &mockCache{}
 	impCache := &mockCache{}
+	respCache := &mockCache{}
 	metricsEngine := &metrics.MetricsEngineMock{}
 	fetcher := &mockFetcher{}
-	afetcherWithCache := WithCache(fetcher, Cache{reqCache, impCache, &nil_cache.NilCache{}}, metricsEngine)
+	afetcherWithCache := WithCache(fetcher, Cache{reqCache, impCache, respCache, &nil_cache.NilCache{}}, metricsEngine)
 
-	return reqCache, impCache, fetcher, afetcherWithCache, metricsEngine
+	return reqCache, impCache, respCache, fetcher, afetcherWithCache, metricsEngine
 }
 
 func TestPerfectCache(t *testing.T) {
-	reqCache, impCache, fetcher, aFetcherWithCache, metricsEngine := setupFetcherWithCacheDeps()
+	reqCache, impCache, respCache, fetcher, aFetcherWithCache, metricsEngine := setupFetcherWithCacheDeps()
 	impIDs := []string{"known"}
 	reqIDs := []string{"req-id"}
+	respIDs := []string{"resp-id"}
 	ctx := context.Background()
 
 	reqCache.On("Get", ctx, reqIDs).Return(
@@ -37,25 +39,34 @@ func TestPerfectCache(t *testing.T) {
 		map[string]json.RawMessage{
 			"known": json.RawMessage(`{}`),
 		})
+	respCache.On("Get", ctx, respIDs).Return(
+		map[string]json.RawMessage{
+			"resp-id": json.RawMessage(`{"req":true}`),
+		})
 	metricsEngine.On("RecordStoredReqCacheResult", metrics.CacheHit, 1)
 	metricsEngine.On("RecordStoredReqCacheResult", metrics.CacheMiss, 0)
 	metricsEngine.On("RecordStoredImpCacheResult", metrics.CacheHit, 1)
 	metricsEngine.On("RecordStoredImpCacheResult", metrics.CacheMiss, 0)
 
 	reqData, impData, errs := aFetcherWithCache.FetchRequests(ctx, reqIDs, impIDs)
+	respData, fetchRespErrs := aFetcherWithCache.FetchResponses(ctx, respIDs)
 
 	reqCache.AssertExpectations(t)
 	impCache.AssertExpectations(t)
+	respCache.AssertExpectations(t)
 	fetcher.AssertExpectations(t)
 	metricsEngine.AssertExpectations(t)
 	assert.JSONEq(t, `{"req":true}`, string(reqData["req-id"]), "Fetch requests should fetch the right request data")
+	assert.JSONEq(t, `{"req":true}`, string(respData["resp-id"]), "Fetch responses should fetch the right response data")
 	assert.JSONEq(t, `{}`, string(impData["known"]), "FetchRequests should fetch the right imp data")
 	assert.Len(t, errs, 0, "FetchRequest shouldn't return any errors")
+	assert.Len(t, fetchRespErrs, 0, "FetchResponses shouldn't return any errors")
 }
 
 func TestImperfectCache(t *testing.T) {
-	reqCache, impCache, fetcher, aFetcherWithCache, metricsEngine := setupFetcherWithCacheDeps()
+	reqCache, impCache, respCache, fetcher, aFetcherWithCache, metricsEngine := setupFetcherWithCacheDeps()
 	impIDs := []string{"cached", "uncached"}
+	respIDs := []string{"cached", "uncached"}
 	ctx := context.Background()
 
 	impCache.On("Get", ctx, impIDs).Return(
@@ -64,6 +75,10 @@ func TestImperfectCache(t *testing.T) {
 		})
 	reqCache.On("Get", ctx, []string(nil)).Return(
 		map[string]json.RawMessage{})
+	respCache.On("Get", ctx, respIDs).Return(
+		map[string]json.RawMessage{
+			"cached": json.RawMessage(`true`),
+		})
 
 	fetcher.On("FetchRequests", ctx, []string{}, []string{"uncached"}).Return(
 		map[string]json.RawMessage{},
@@ -76,26 +91,45 @@ func TestImperfectCache(t *testing.T) {
 		map[string]json.RawMessage{
 			"uncached": json.RawMessage(`false`),
 		})
+
+	fetcher.On("FetchResponses", ctx, []string{"uncached"}).Return(
+		map[string]json.RawMessage{
+			"uncached": json.RawMessage(`false`),
+		},
+		[]error{},
+	)
+	respCache.On("Save", ctx,
+		map[string]json.RawMessage{
+			"uncached": json.RawMessage(`false`),
+		})
+
 	reqCache.On("Save", ctx, map[string]json.RawMessage{})
+
 	metricsEngine.On("RecordStoredReqCacheResult", metrics.CacheHit, 0)
 	metricsEngine.On("RecordStoredReqCacheResult", metrics.CacheMiss, 0)
 	metricsEngine.On("RecordStoredImpCacheResult", metrics.CacheHit, 1)
 	metricsEngine.On("RecordStoredImpCacheResult", metrics.CacheMiss, 1)
 
 	reqData, impData, errs := aFetcherWithCache.FetchRequests(ctx, nil, impIDs)
+	respData, fetchRespErrs := aFetcherWithCache.FetchResponses(ctx, respIDs)
 
 	impCache.AssertExpectations(t)
+	respCache.AssertExpectations(t)
 	fetcher.AssertExpectations(t)
 	metricsEngine.AssertExpectations(t)
 	assert.Len(t, reqData, 0, "Fetch requests should return nil if no request IDs were passed")
 	assert.JSONEq(t, `true`, string(impData["cached"]), "FetchRequests should fetch the right imp data")
 	assert.JSONEq(t, `false`, string(impData["uncached"]), "FetchRequests should fetch the right imp data")
+	assert.JSONEq(t, `true`, string(respData["cached"]), "FetchResponses should fetch the right resp data")
+	assert.JSONEq(t, `false`, string(respData["uncached"]), "FetchResponses should fetch the right resp data")
 	assert.Len(t, errs, 0, "FetchRequest shouldn't return any errors")
+	assert.Len(t, fetchRespErrs, 0, "FetchResponses shouldn't return any errors")
 }
 
 func TestMissingData(t *testing.T) {
-	reqCache, impCache, fetcher, aFetcherWithCache, metricsEngine := setupFetcherWithCacheDeps()
+	reqCache, impCache, respCache, fetcher, aFetcherWithCache, metricsEngine := setupFetcherWithCacheDeps()
 	impIDs := []string{"unknown"}
+	respIDs := []string{"unknown"}
 	ctx := context.Background()
 
 	impCache.On("Get", ctx, impIDs).Return(
@@ -103,6 +137,10 @@ func TestMissingData(t *testing.T) {
 	)
 	reqCache.On("Get", ctx, []string(nil)).Return(
 		map[string]json.RawMessage{})
+
+	respCache.On("Get", ctx, []string(respIDs)).Return(
+		map[string]json.RawMessage{})
+
 	fetcher.On("FetchRequests", ctx, []string{}, impIDs).Return(
 		map[string]json.RawMessage{},
 		map[string]json.RawMessage{},
@@ -110,38 +148,59 @@ func TestMissingData(t *testing.T) {
 			errors.New("Data not found"),
 		},
 	)
+
+	fetcher.On("FetchResponses", ctx, respIDs).Return(
+		map[string]json.RawMessage{},
+		[]error{
+			errors.New("Data not found"),
+		},
+	)
+
 	impCache.On("Save", ctx,
 		map[string]json.RawMessage{},
 	)
 	reqCache.On("Save", ctx,
 		map[string]json.RawMessage{},
 	)
+
+	respCache.On("Save", ctx,
+		map[string]json.RawMessage{},
+	)
 	metricsEngine.On("RecordStoredReqCacheResult", metrics.CacheHit, 0)
 	metricsEngine.On("RecordStoredReqCacheResult", metrics.CacheMiss, 0)
 	metricsEngine.On("RecordStoredImpCacheResult", metrics.CacheHit, 0)
 	metricsEngine.On("RecordStoredImpCacheResult", metrics.CacheMiss, 1)
 
 	reqData, impData, errs := aFetcherWithCache.FetchRequests(ctx, nil, impIDs)
+	respData, fetchRespErrs := aFetcherWithCache.FetchResponses(ctx, respIDs)
 
 	reqCache.AssertExpectations(t)
 	impCache.AssertExpectations(t)
+	respCache.AssertExpectations(t)
 	fetcher.AssertExpectations(t)
 	metricsEngine.AssertExpectations(t)
 	assert.Len(t, errs, 1, "FetchRequests for missing data should return an error")
+	assert.Len(t, fetchRespErrs, 1, "FetchResponses for missing data should return an error")
 	assert.Len(t, reqData, 0, "FetchRequests for missing data shouldn't return anything")
 	assert.Len(t, impData, 0, "FetchRequests for missing data shouldn't return anything")
+	assert.Len(t, respData, 0, "FetchRequests for missing data shouldn't return anything")
 }
 
 // Prevents #311
 func TestCacheSaves(t *testing.T) {
-	reqCache, impCache, fetcher, aFetcherWithCache, metricsEngine := setupFetcherWithCacheDeps()
+	reqCache, impCache, respCache, fetcher, aFetcherWithCache, metricsEngine := setupFetcherWithCacheDeps()
 	impIDs := []string{"abc", "abc"}
+	respIDs := []string{"abc", "abc"}
 	ctx := context.Background()
 
 	impCache.On("Get", ctx, impIDs).Return(
 		map[string]json.RawMessage{
 			"abc": json.RawMessage(`{}`),
 		})
+	respCache.On("Get", ctx, respIDs).Return(
+		map[string]json.RawMessage{
+			"abc": json.RawMessage(`{}`),
+		})
 	reqCache.On("Get", ctx, []string(nil)).Return(
 		map[string]json.RawMessage{})
 	metricsEngine.On("RecordStoredReqCacheResult", metrics.CacheHit, 0)
@@ -150,20 +209,24 @@ func TestCacheSaves(t *testing.T) {
 	metricsEngine.On("RecordStoredImpCacheResult", metrics.CacheMiss, 0)
 
 	_, impData, errs := aFetcherWithCache.FetchRequests(ctx, nil, []string{"abc", "abc"})
+	respData, fetchRespErrs := aFetcherWithCache.FetchResponses(ctx, respIDs)
 
 	impCache.AssertExpectations(t)
+	respCache.AssertExpectations(t)
 	fetcher.AssertExpectations(t)
 	metricsEngine.AssertExpectations(t)
 	assert.Len(t, impData, 1, "FetchRequests should return data only once for duplicate requests")
 	assert.JSONEq(t, `{}`, string(impData["abc"]), "FetchRequests should fetch the right imp data")
+	assert.JSONEq(t, `{}`, string(respData["abc"]), "FetchResponses should fetch the right resp data")
 	assert.Len(t, errs, 0, "FetchRequests with duplicate IDs shouldn't return an error")
+	assert.Len(t, fetchRespErrs, 0, "FetchResponses with duplicate IDs shouldn't return an error")
 }
 
 func setupAccountFetcherWithCacheDeps() (*mockCache, *mockFetcher, AllFetcher, *metrics.MetricsEngineMock) {
 	accCache := &mockCache{}
 	metricsEngine := &metrics.MetricsEngineMock{}
 	fetcher := &mockFetcher{}
-	afetcherWithCache := WithCache(fetcher, Cache{&nil_cache.NilCache{}, &nil_cache.NilCache{}, accCache}, metricsEngine)
+	afetcherWithCache := WithCache(fetcher, Cache{&nil_cache.NilCache{}, &nil_cache.NilCache{}, &nil_cache.NilCache{}, accCache}, metricsEngine)
 
 	return accCache, fetcher, afetcherWithCache, metricsEngine
 }
@@ -219,8 +282,9 @@ func TestComposedCache(t *testing.T) {
 	c4 := &mockCache{}
 	impCache := &mockCache{}
 	cache := Cache{
-		Requests: ComposedCache{c1, c2, c3, c4},
-		Imps:     impCache,
+		Requests:  ComposedCache{c1, c2, c3, c4},
+		Imps:      impCache,
+		Responses: ComposedCache{c1, c2, c3, c4},
 	}
 	metricsEngine := &metrics.MetricsEngineMock{}
 	fetcher := &mockFetcher{}
@@ -242,12 +306,14 @@ func TestComposedCache(t *testing.T) {
 			"3": json.RawMessage(`{"id": "3"}`),
 		})
 	impCache.On("Get", ctx, []string{}).Return(map[string]json.RawMessage{})
+
 	metricsEngine.On("RecordStoredReqCacheResult", metrics.CacheHit, 3)
 	metricsEngine.On("RecordStoredReqCacheResult", metrics.CacheMiss, 0)
 	metricsEngine.On("RecordStoredImpCacheResult", metrics.CacheHit, 0)
 	metricsEngine.On("RecordStoredImpCacheResult", metrics.CacheMiss, 0)
 
 	reqData, impData, errs := aFetcherWithCache.FetchRequests(ctx, reqIDs, impIDs)
+	respData, fetchRespErrs := aFetcherWithCache.FetchResponses(ctx, reqIDs)
 
 	c1.AssertExpectations(t)
 	c2.AssertExpectations(t)
@@ -256,11 +322,16 @@ func TestComposedCache(t *testing.T) {
 	fetcher.AssertExpectations(t)
 	metricsEngine.AssertExpectations(t)
 	assert.Len(t, reqData, len(reqIDs), "FetchRequests should be able to return all request data from a composed cache")
+	assert.Len(t, respData, len(reqIDs), "FetchResponses should be able to return all response data from a composed cache")
 	assert.Len(t, impData, len(impIDs), "FetchRequests should be able to return all imp data from a composed cache")
 	assert.Len(t, errs, 0, "FetchRequests shouldn't return an error when trying to use a composed cache")
+	assert.Len(t, fetchRespErrs, 0, "FetchResponses shouldn't return an error when trying to use a composed cache")
 	assert.JSONEq(t, `{"id": "1"}`, string(reqData["1"]), "FetchRequests should fetch the right req data")
 	assert.JSONEq(t, `{"id": "2"}`, string(reqData["2"]), "FetchRequests should fetch the right req data")
 	assert.JSONEq(t, `{"id": "3"}`, string(reqData["3"]), "FetchRequests should fetch the right req data")
+	assert.JSONEq(t, `{"id": "1"}`, string(respData["1"]), "FetchResponses should fetch the right resp data")
+	assert.JSONEq(t, `{"id": "2"}`, string(respData["2"]), "FetchResponses should fetch the right resp data")
+	assert.JSONEq(t, `{"id": "3"}`, string(respData["3"]), "FetchResponses should fetch the right resp data")
 }
 
 type mockFetcher struct {
@@ -272,6 +343,11 @@ func (f *mockFetcher) FetchRequests(ctx context.Context, requestIDs []string, im
 	return args.Get(0).(map[string]json.RawMessage), args.Get(1).(map[string]json.RawMessage), args.Get(2).([]error)
 }
 
+func (f *mockFetcher) FetchResponses(ctx context.Context, ids []string) (data map[string]json.RawMessage, errs []error) {
+	args := f.Called(ctx, ids)
+	return args.Get(0).(map[string]json.RawMessage), args.Get(1).([]error)
+}
+
 func (a *mockFetcher) FetchAccount(ctx context.Context, accountID string) (json.RawMessage, []error) {
 	args := a.Called(ctx, accountID)
 	return args.Get(0).(json.RawMessage), args.Get(1).([]error)
diff --git a/stored_requests/multifetcher.go b/stored_requests/multifetcher.go
index 2d08fd45337..70b1d62b8c1 100644
--- a/stored_requests/multifetcher.go
+++ b/stored_requests/multifetcher.go
@@ -36,6 +36,10 @@ func (mf MultiFetcher) FetchRequests(ctx context.Context, requestIDs []string, i
 	return
 }
 
+func (mf MultiFetcher) FetchResponses(ctx context.Context, ids []string) (data map[string]json.RawMessage, errs []error) {
+	return nil, nil
+}
+
 func (mf MultiFetcher) FetchAccount(ctx context.Context, accountID string) (account json.RawMessage, errs []error) {
 	for _, f := range mf {
 		if af, ok := f.(AccountFetcher); ok {