From 62ce92d8126355ffaa97d2b52c8af6828f5a590a Mon Sep 17 00:00:00 2001
From: Dimitrij Denissenko <dimitrij.denissenko@blacksquaremedia.com>
Date: Mon, 28 Oct 2019 11:37:04 +0000
Subject: [PATCH] New major release

---
 .travis.yml                      |  10 +-
 LICENSE                          |  24 +
 README.md                        |  42 +-
 audio.go                         |  48 +-
 audio_test.go                    |  61 ++-
 banner.go                        |  36 +-
 banner_test.go                   |  17 +-
 bid.go                           |  55 +-
 bid_test.go                      |  11 +-
 bidrequest.go                    |  51 +-
 bidrequest_test.go               |  40 +-
 bidresponse.go                   |  13 +-
 bidresponse_test.go              |  17 +-
 content.go                       |  54 +-
 content_test.go                  |  10 +-
 device.go                        |  64 +--
 device_test.go                   |  19 +-
 doc.go                           |   2 +-
 go.mod                           |  15 +-
 go.sum                           |  31 +-
 impression.go                    |  36 +-
 impression_test.go               |   9 +-
 inventory.go                     |  37 +-
 inventory_test.go                |  22 +-
 native.go                        |  12 +-
 native/request/asset.go          |   2 +-
 native/request/data.go           |   3 +
 native/request/image.go          |   5 +-
 native/request/request.go        |  58 ++-
 native/request/request_test.go   |   8 +-
 native/request/title.go          |   1 +
 native/request/video.go          |  18 +-
 native/response/asset.go         |   2 +-
 native/response/data.go          |   1 +
 native/response/image.go         |   1 +
 native/response/link.go          |   1 +
 native/response/response.go      |   6 +-
 native/response/response_test.go |  13 +-
 native/response/title.go         |   1 +
 native/response/video.go         |   1 +
 native_test.go                   |   6 +-
 numbers_test.go                  |   4 -
 openrtb.go                       | 851 +++++++++++++++++++++++++------
 openrtb_test.go                  |   3 +-
 pmp.go                           |  13 +-
 pmp_test.go                      |  13 +-
 seatbid.go                       |  11 +-
 seatbid_test.go                  |   4 +-
 video.go                         |  62 +--
 video_test.go                    |  63 ++-
 50 files changed, 1196 insertions(+), 691 deletions(-)
 create mode 100644 LICENSE

diff --git a/.travis.yml b/.travis.yml
index 55a9f71..b888a14 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,9 @@
 language: go
 go:
-  - 1.10.x
-  - 1.11.x
-install:
-  - go get -t ./...
+  - 1.12.x
+  - 1.13.x
 env:
   - GO111MODULE=on
-
+cache:
+  directories:
+    - $GOPATH/pkg/mod
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..f731b7e
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,24 @@
+Copyright (c) 2015 Black Square Media Ltd. All rights reserved.
+(The MIT License)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Some test examples were taken from:
+https://code.google.com/p/openrtb/wiki/OpenRTB_Examples
diff --git a/README.md b/README.md
index e127471..73cb6be 100644
--- a/README.md
+++ b/README.md
@@ -1,31 +1,29 @@
-# Go OpenRTB v2.x
+# OpenRTB
 
 [![Build Status](https://travis-ci.org/bsm/openrtb.svg?branch=master)](https://travis-ci.org/bsm/openrtb)
 
-OpenRTB implementation for Go
+OpenRTB structs and validations for Go.
 
 ## Requirements
 
-Requires Go 1.8+ for proper `json.RawMessage` marshalling.
+Requires Go 1.8+ for proper `json.RawMessage` marshaling.
 
 ## Installation
 
 To install, use `go get`:
 
 ```shell
-go get github.com/bsm/openrtb
+go get github.com/bsm/openrtb/v3
 ```
 
 ## Usage
 
-Import the package:
-
 ```go
 package main
 
 import (
   "log"
-  "github.com/bsm/openrtb"
+  "github.com/bsm/openrtb/v3"
 )
 
 func main() {
@@ -36,38 +34,10 @@ func main() {
   defer file.Close()
 
   var req *openrtb.BidRequest
-  err = json.NewDecoder(file).Decode(&req)
-  if err != nil {
+  if err := json.NewDecoder(file).Decode(&req); err != nil {
     log.Fatal(err)
   }
 
   log.Printf("%+v\n", req)
 }
 ```
-
-## Licence
-
-    Copyright (c) 2015 Black Square Media Ltd. All rights reserved.
-    (The MIT License)
-
-    Permission is hereby granted, free of charge, to any person obtaining
-    a copy of this software and associated documentation files (the
-    'Software'), to deal in the Software without restriction, including
-    without limitation the rights to use, copy, modify, merge, publish,
-    distribute, sublicense, and/or sell copies of the Software, and to
-    permit persons to whom the Software is furnished to do so, subject to
-    the following conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-    Some test examples were taken from:
-    https://code.google.com/p/openrtb/wiki/OpenRTB_Examples
diff --git a/audio.go b/audio.go
index 4a64e5a..1c67131 100644
--- a/audio.go
+++ b/audio.go
@@ -7,38 +7,38 @@ import (
 
 // Validation errors
 var (
-	ErrInvalidAudioNoMimes = errors.New("openrtb: audio has no mimes")
+	ErrInvalidAudioNoMIMEs = errors.New("openrtb: audio has no mimes")
 )
 
-// The "audio" object must be included directly in the impression object
+// Audio object must be included directly in the impression object
 type Audio struct {
-	Mimes         []string        `json:"mimes"`                 // Content MIME types supported.
-	MinDuration   int             `json:"minduration,omitempty"` // Minimum video ad duration in seconds
-	MaxDuration   int             `json:"maxduration,omitempty"` // Maximum video ad duration in seconds
-	Protocols     []int           `json:"protocols,omitempty"`   // Video bid response protocols
-	StartDelay    int             `json:"startdelay,omitempty"`  // Indicates the start delay in seconds
-	Sequence      int             `json:"sequence,omitempty"`    // Default: 1
-	BAttr         []int           `json:"battr,omitempty"`       // Blocked creative attributes
-	MaxExtended   int             `json:"maxextended,omitempty"` // Maximum extended video ad duration
-	MinBitrate    int             `json:"minbitrate,omitempty"`  // Minimum bit rate in Kbps
-	MaxBitrate    int             `json:"maxbitrate,omitempty"`  // Maximum bit rate in Kbps
-	Delivery      []int           `json:"delivery,omitempty"`    // List of supported delivery methods
-	CompanionAd   []Banner        `json:"companionad,omitempty"`
-	API           []int           `json:"api,omitempty"`
-	CompanionType []int           `json:"companiontype,omitempty"`
-	MaxSequence   int             `json:"maxseq,omitempty"`   // The maximumnumber of ads that canbe played in an ad pod.
-	Feed          int             `json:"feed,omitempty"`     // Type of audio feed.
-	Stitched      int             `json:"stitched,omitempty"` // Indicates if the ad is stitched with audio content or delivered independently
-	NVol          int             `json:"nvol,omitempty"`     // Volume normalization mode.
-	Ext           json.RawMessage `json:"ext,omitempty"`
+	MIMEs          []string            `json:"mimes"`                 // Content MIME types supported.
+	MinDuration    int                 `json:"minduration,omitempty"` // Minimum video ad duration in seconds
+	MaxDuration    int                 `json:"maxduration,omitempty"` // Maximum video ad duration in seconds
+	Protocols      []Protocol          `json:"protocols,omitempty"`   // Video bid response protocols
+	StartDelay     StartDelay          `json:"startdelay,omitempty"`  // Indicates the start delay in seconds
+	Sequence       int                 `json:"sequence,omitempty"`    // Default: 1
+	BlockedAttrs   []CreativeAttribute `json:"battr,omitempty"`       // Blocked creative attributes
+	MaxExtended    int                 `json:"maxextended,omitempty"` // Maximum extended video ad duration
+	MinBitrate     int                 `json:"minbitrate,omitempty"`  // Minimum bit rate in Kbps
+	MaxBitrate     int                 `json:"maxbitrate,omitempty"`  // Maximum bit rate in Kbps
+	Delivery       []ContentDelivery   `json:"delivery,omitempty"`    // List of supported delivery methods
+	CompanionAds   []Banner            `json:"companionad,omitempty"`
+	APIs           []APIFramework      `json:"api,omitempty"`
+	CompanionTypes []CompanionType     `json:"companiontype,omitempty"`
+	MaxSequence    int                 `json:"maxseq,omitempty"`   // The maximumnumber of ads that canbe played in an ad pod.
+	Feed           FeedType            `json:"feed,omitempty"`     // Type of audio feed.
+	Stitched       int                 `json:"stitched,omitempty"` // Indicates if the ad is stitched with audio content or delivered independently
+	VolumeNorm     VolumeNorm          `json:"nvol,omitempty"`     // Volume normalization mode.
+	Ext            json.RawMessage     `json:"ext,omitempty"`
 }
 
 type jsonAudio Audio
 
-// Validates the object
+// Validate the object
 func (a *Audio) Validate() error {
-	if len(a.Mimes) == 0 {
-		return ErrInvalidAudioNoMimes
+	if len(a.MIMEs) == 0 {
+		return ErrInvalidAudioNoMIMEs
 	}
 	return nil
 }
diff --git a/audio_test.go b/audio_test.go
index 4a4937e..85e9dfd 100644
--- a/audio_test.go
+++ b/audio_test.go
@@ -9,50 +9,49 @@ var _ = Describe("Audio", func() {
 	var subject *Audio
 
 	BeforeEach(func() {
-		err := fixture("audio", &subject)
-		Expect(err).NotTo(HaveOccurred())
+		Expect(fixture("audio", &subject)).To(Succeed())
 	})
 
 	It("should parse correctly", func() {
 		Expect(subject).To(Equal(&Audio{
-			Mimes: []string{
+			MIMEs: []string{
 				"audio/mp4",
 			},
-			MinDuration: 5,
-			MaxDuration: 30,
-			Protocols:   []int{AudioProtocolDAAST1, AudioProtocolDAAST1Wrapper},
-			Sequence:    1,
-			BAttr:       []int{CreativeAttributeUserInitiated, CreativeAttributeWindowsDialogOrAlert},
-			MaxExtended: 30,
-			MinBitrate:  300,
-			MaxBitrate:  1500,
-			Delivery:    []int{ContentDeliveryProgressive},
-			CompanionAd: []Banner{
-				{W: 300, H: 250, ID: "1234567893-1", Pos: AdPosAboveFold, BAttr: []int{CreativeAttributeUserInitiated, CreativeAttributeWindowsDialogOrAlert}, ExpDir: []int{ExpDirRight, ExpDirDown}},
-				{W: 728, H: 90, ID: "1234567893-2", Pos: AdPosAboveFold, BAttr: []int{CreativeAttributeUserInitiated, CreativeAttributeWindowsDialogOrAlert}},
+			MinDuration:  5,
+			MaxDuration:  30,
+			Protocols:    []Protocol{ProtocolDAAST1, ProtocolDAAST1Wrapper},
+			Sequence:     1,
+			BlockedAttrs: []CreativeAttribute{CreativeAttributeUserInitiated, CreativeAttributeWindowsDialogOrAlert},
+			MaxExtended:  30,
+			MinBitrate:   300,
+			MaxBitrate:   1500,
+			Delivery:     []ContentDelivery{ContentDeliveryProgressive},
+			CompanionAds: []Banner{
+				{Width: 300, Height: 250, ID: "1234567893-1", Position: AdPositionAboveFold, BlockedAttrs: []CreativeAttribute{CreativeAttributeUserInitiated, CreativeAttributeWindowsDialogOrAlert}, ExpDirs: []ExpDir{ExpDirRight, ExpDirDown}},
+				{Width: 728, Height: 90, ID: "1234567893-2", Position: AdPositionAboveFold, BlockedAttrs: []CreativeAttribute{CreativeAttributeUserInitiated, CreativeAttributeWindowsDialogOrAlert}},
 			},
-			API:           []int{APIFrameworkVPAID1, APIFrameworkVPAID2},
-			CompanionType: []int{VASTCompanionStatic, VASTCompanionHTML},
+			APIs:           []APIFramework{APIFrameworkVPAID1, APIFrameworkVPAID2},
+			CompanionTypes: []CompanionType{CompanionTypeStatic, CompanionTypeHTML},
 		}))
 	})
 
 	It("should validate", func() {
 		Expect((&Audio{
-			MinDuration: 5,
-			MaxDuration: 30,
-			Protocols:   []int{AudioProtocolDAAST1, AudioProtocolDAAST1Wrapper},
-			Sequence:    1,
-			BAttr:       []int{CreativeAttributeUserInitiated, CreativeAttributeWindowsDialogOrAlert},
-			MaxExtended: 30,
-			MinBitrate:  300,
-			MaxBitrate:  1500,
-			Delivery:    []int{ContentDeliveryProgressive},
-			CompanionAd: []Banner{
-				{W: 300, H: 250, ID: "1234567893-1", Pos: AdPosAboveFold, BAttr: []int{CreativeAttributeUserInitiated, CreativeAttributeWindowsDialogOrAlert}, ExpDir: []int{ExpDirRight, ExpDirDown}},
-				{W: 728, H: 90, ID: "1234567893-2", Pos: AdPosAboveFold, BAttr: []int{CreativeAttributeUserInitiated, CreativeAttributeWindowsDialogOrAlert}},
+			MinDuration:  5,
+			MaxDuration:  30,
+			Protocols:    []Protocol{ProtocolDAAST1, ProtocolDAAST1Wrapper},
+			Sequence:     1,
+			BlockedAttrs: []CreativeAttribute{CreativeAttributeUserInitiated, CreativeAttributeWindowsDialogOrAlert},
+			MaxExtended:  30,
+			MinBitrate:   300,
+			MaxBitrate:   1500,
+			Delivery:     []ContentDelivery{ContentDeliveryProgressive},
+			CompanionAds: []Banner{
+				{Width: 300, Height: 250, ID: "1234567893-1", Position: AdPositionAboveFold, BlockedAttrs: []CreativeAttribute{CreativeAttributeUserInitiated, CreativeAttributeWindowsDialogOrAlert}, ExpDirs: []ExpDir{ExpDirRight, ExpDirDown}},
+				{Width: 728, Height: 90, ID: "1234567893-2", Position: AdPositionAboveFold, BlockedAttrs: []CreativeAttribute{CreativeAttributeUserInitiated, CreativeAttributeWindowsDialogOrAlert}},
 			},
-			CompanionType: []int{VASTCompanionStatic, VASTCompanionHTML},
-		}).Validate()).To(Equal(ErrInvalidAudioNoMimes))
+			CompanionTypes: []CompanionType{CompanionTypeStatic, CompanionTypeHTML},
+		}).Validate()).To(Equal(ErrInvalidAudioNoMIMEs))
 	})
 
 })
diff --git a/banner.go b/banner.go
index 5468626..0b8fc98 100644
--- a/banner.go
+++ b/banner.go
@@ -2,28 +2,28 @@ package openrtb
 
 import "encoding/json"
 
-// The "banner" object must be included directly in the impression object if the impression offered
+// Banner object must be included directly in the impression object if the impression offered
 // for auction is display or rich media, or it may be optionally embedded in the video object to
 // describe the companion banners available for the linear or non-linear video ad.  The banner
 // object may include a unique identifier; this can be useful if these IDs can be leveraged in the
 // VAST response to dictate placement of the companion creatives when multiple companion ad
 // opportunities of the same size are available on a page.
 type Banner struct {
-	W        int             `json:"w,omitempty"`        // Width
-	H        int             `json:"h,omitempty"`        // Height
-	Format   []Format        `json:"format,omitempty"`   //Array of format objects representing the banner sizes permitted.
-	WMax     int             `json:"wmax,omitempty"`     // Width maximum DEPRECATED
-	HMax     int             `json:"hmax,omitempty"`     // Height maximum DEPRECATED
-	WMin     int             `json:"wmin,omitempty"`     // Width minimum DEPRECATED
-	HMin     int             `json:"hmin,omitempty"`     // Height minimum DEPRECATED
-	ID       string          `json:"id,omitempty"`       // A unique identifier
-	BType    []int           `json:"btype,omitempty"`    // Blocked creative types
-	BAttr    []int           `json:"battr,omitempty"`    // Blocked creative attributes
-	Pos      int             `json:"pos,omitempty"`      // Ad Position
-	Mimes    []string        `json:"mimes,omitempty"`    // Whitelist of content MIME types supported
-	TopFrame int             `json:"topframe,omitempty"` // Default: 0 ("1": Delivered in top frame, "0": Elsewhere)
-	ExpDir   []int           `json:"expdir,omitempty"`   // Specify properties for an expandable ad
-	Api      []int           `json:"api,omitempty"`      // List of supported API frameworks
-	Vcm      int             `json:"vcm,omitempty"`      // Represents the relationship with video. 0 = concurrent, 1 = end-card
-	Ext      json.RawMessage `json:"ext,omitempty"`
+	Width        int                 `json:"w,omitempty"`        // Width
+	Height       int                 `json:"h,omitempty"`        // Height
+	Formats      []Format            `json:"format,omitempty"`   // Array of format objects representing the banner sizes permitted.
+	WidthMax     int                 `json:"wmax,omitempty"`     // Width maximum DEPRECATED
+	HeightMax    int                 `json:"hmax,omitempty"`     // Height maximum DEPRECATED
+	WidthMin     int                 `json:"wmin,omitempty"`     // Width minimum DEPRECATED
+	HeightMin    int                 `json:"hmin,omitempty"`     // Height minimum DEPRECATED
+	ID           string              `json:"id,omitempty"`       // A unique identifier
+	BlockedTypes []BannerType        `json:"btype,omitempty"`    // Blocked banner types
+	BlockedAttrs []CreativeAttribute `json:"battr,omitempty"`    // Blocked creative attributes
+	Position     AdPosition          `json:"pos,omitempty"`      // Ad Position
+	MIMEs        []string            `json:"mimes,omitempty"`    // Whitelist of content MIME types supported
+	TopFrame     int                 `json:"topframe,omitempty"` // Default: 0 ("1": Delivered in top frame, "0": Elsewhere)
+	ExpDirs      []ExpDir            `json:"expdir,omitempty"`   // Specify properties for an expandable ad
+	APIs         []APIFramework      `json:"api,omitempty"`      // List of supported API frameworks
+	VCM          int                 `json:"vcm,omitempty"`      // Represents the relationship with video. 0 = concurrent, 1 = end-card
+	Ext          json.RawMessage     `json:"ext,omitempty"`
 }
diff --git a/banner_test.go b/banner_test.go
index f982d2b..26e3f0d 100644
--- a/banner_test.go
+++ b/banner_test.go
@@ -9,19 +9,18 @@ var _ = Describe("Banner", func() {
 	var subject *Banner
 
 	BeforeEach(func() {
-		err := fixture("banner", &subject)
-		Expect(err).NotTo(HaveOccurred())
+		Expect(fixture("banner", &subject)).To(Succeed())
 	})
 
 	It("should parse correctly", func() {
 		Expect(subject).To(Equal(&Banner{
-			W:     728,
-			H:     90,
-			Pos:   AdPosAboveFold,
-			BType: []int{BannerTypeFrame},
-			BAttr: []int{CreativeAttributeWindowsDialogOrAlert},
-			Api:   []int{APIFrameworkMRAID1},
-			Vcm:   1,
+			Width:        728,
+			Height:       90,
+			Position:     AdPositionAboveFold,
+			BlockedTypes: []BannerType{BannerTypeFrame},
+			BlockedAttrs: []CreativeAttribute{CreativeAttributeWindowsDialogOrAlert},
+			APIs:         []APIFramework{APIFrameworkMRAID1},
+			VCM:          1,
 		}))
 	})
 
diff --git a/bid.go b/bid.go
index 18a98c8..f8a3a5c 100644
--- a/bid.go
+++ b/bid.go
@@ -11,6 +11,7 @@ var (
 	ErrInvalidBidNoImpID = errors.New("openrtb: bid is missing impression ID")
 )
 
+// Bid object contains bid information.
 // ID, ImpID and Price are required; all other optional.
 // If the bidder wins the impression, the exchange calls notice URL (nurl)
 // a) to inform the bidder of the win;
@@ -19,33 +20,33 @@ var (
 // Cid can be used to block ads that were previously identified as inappropriate.
 // Substitution macros may allow a bidder to use a static notice URL for all of its bids.
 type Bid struct {
-	ID             string          `json:"id"`
-	ImpID          string          `json:"impid"`                    // Required string ID of the impression object to which this bid applies.
-	Price          float64         `json:"price"`                    // Bid price in CPM. Suggests using integer math for accounting to avoid rounding errors.
-	AdID           string          `json:"adid,omitempty"`           // References the ad to be served if the bid wins.
-	NURL           string          `json:"nurl,omitempty"`           // Win notice URL.
-	BURL           string          `json:"burl,omitempty"`           // Billing notice URL.
-	LURL           string          `json:"lurl,omitempty"`           // Loss notice URL.
-	AdMarkup       string          `json:"adm,omitempty"`            // Actual ad markup. XHTML if a response to a banner object, or VAST XML if a response to a video object.
-	AdvDomain      []string        `json:"adomain,omitempty"`        // Advertiser’s primary or top-level domain for advertiser checking; or multiple if imp rotating.
-	Bundle         string          `json:"bundle,omitempty"`         // A platform-specific application identifier intended to be unique to the app and independent of the exchange.
-	IURL           string          `json:"iurl,omitempty"`           // Sample image URL.
-	CampaignID     StringOrNumber  `json:"cid,omitempty"`            // Campaign ID that appears with the Ad markup.
-	CreativeID     string          `json:"crid,omitempty"`           // Creative ID for reporting content issues or defects. This could also be used as a reference to a creative ID that is posted with an exchange.
-	Tactic         string          `json:"tactic,omitempty"`         // Tactic ID to enable buyers to label bids for reporting to the exchange the tactic through which their bid was submitted.
-	Cat            []string        `json:"cat,omitempty"`            // IAB content categories of the creative. Refer to List 5.1
-	Attr           []int           `json:"attr,omitempty"`           // Array of creative attributes.
-	API            int             `json:"api,omitempty"`            // API required by the markup if applicable
-	Protocol       int             `json:"protocol,omitempty"`       // Video response protocol of the markup if applicable
-	QAGMediaRating int             `json:"qagmediarating,omitempty"` // Creative media rating per IQG guidelines.
-	Language       string          `json:"language,omitempty"`       // Language of the creative using ISO-639-1-alpha-2.
-	DealID         string          `json:"dealid,omitempty"`         // DealID extension of private marketplace deals
-	H              int             `json:"h,omitempty"`              // Height of the ad in pixels.
-	W              int             `json:"w,omitempty"`              // Width of the ad in pixels.
-	WRatio         int             `json:"wratio,omitempty"`         // Relative width of the creative when expressing size as a ratio.
-	HRatio         int             `json:"hratio,omitempty"`         // Relative height of the creative when expressing size as a ratio.
-	Exp            int             `json:"exp,omitempty"`            // Advisory as to the number of seconds the bidder is willing to wait between the auction and the actual impression.
-	Ext            json.RawMessage `json:"ext,omitempty"`
+	ID          string              `json:"id"`
+	ImpID       string              `json:"impid"`                    // Required string ID of the impression object to which this bid applies.
+	Price       float64             `json:"price"`                    // Bid price in CPM. Suggests using integer math for accounting to avoid rounding errors.
+	AdID        string              `json:"adid,omitempty"`           // References the ad to be served if the bid wins.
+	NoticeURL   string              `json:"nurl,omitempty"`           // Win notice URL.
+	BillingURL  string              `json:"burl,omitempty"`           // Billing notice URL.
+	LossURL     string              `json:"lurl,omitempty"`           // Loss notice URL.
+	AdMarkup    string              `json:"adm,omitempty"`            // Actual ad markup. XHTML if a response to a banner object, or VAST XML if a response to a video object.
+	AdvDomains  []string            `json:"adomain,omitempty"`        // Advertiser’s primary or top-level domain for advertiser checking; or multiple if imp rotating.
+	Bundle      string              `json:"bundle,omitempty"`         // A platform-specific application identifier intended to be unique to the app and independent of the exchange.
+	ImageURL    string              `json:"iurl,omitempty"`           // Sample image URL.
+	CampaignID  StringOrNumber      `json:"cid,omitempty"`            // Campaign ID that appears with the Ad markup.
+	CreativeID  string              `json:"crid,omitempty"`           // Creative ID for reporting content issues or defects. This could also be used as a reference to a creative ID that is posted with an exchange.
+	Tactic      string              `json:"tactic,omitempty"`         // Tactic ID to enable buyers to label bids for reporting to the exchange the tactic through which their bid was submitted.
+	Categories  []ContentCategory   `json:"cat,omitempty"`            // IAB content categories of the creative. Refer to List 5.1
+	Attrs       []CreativeAttribute `json:"attr,omitempty"`           // Array of creative attributes.
+	API         APIFramework        `json:"api,omitempty"`            // API required by the markup if applicable
+	Protocol    Protocol            `json:"protocol,omitempty"`       // Video response protocol of the markup if applicable
+	MediaRating IQGRating           `json:"qagmediarating,omitempty"` // Creative media rating per IQG guidelines.
+	Language    string              `json:"language,omitempty"`       // Language of the creative using ISO-639-1-alpha-2.
+	DealID      string              `json:"dealid,omitempty"`         // DealID extension of private marketplace deals
+	Width       int                 `json:"w,omitempty"`              // Width of the ad in pixels.
+	Height      int                 `json:"h,omitempty"`              // Height of the ad in pixels.
+	WidthRatio  int                 `json:"wratio,omitempty"`         // Relative width of the creative when expressing size as a ratio.
+	HeightRatio int                 `json:"hratio,omitempty"`         // Relative height of the creative when expressing size as a ratio.
+	Exp         int                 `json:"exp,omitempty"`            // Advisory as to the number of seconds the bidder is willing to wait between the auction and the actual impression.
+	Ext         json.RawMessage     `json:"ext,omitempty"`
 }
 
 // Validate required attributes
diff --git a/bid_test.go b/bid_test.go
index 369d2bd..44899b3 100644
--- a/bid_test.go
+++ b/bid_test.go
@@ -9,8 +9,7 @@ var _ = Describe("Bid", func() {
 	var subject *Bid
 
 	BeforeEach(func() {
-		err := fixture("bid", &subject)
-		Expect(err).NotTo(HaveOccurred())
+		Expect(fixture("bid", &subject)).To(Succeed())
 	})
 
 	It("should parse correctly", func() {
@@ -19,14 +18,14 @@ var _ = Describe("Bid", func() {
 			ImpID:      "1",
 			Price:      0.751371,
 			AdID:       "52a5516d29e435137c6f6e74",
-			NURL:       "http://ads.com/win/112770_1386565997?won=${AUCTION_PRICE}",
+			NoticeURL:  "http://ads.com/win/112770_1386565997?won=${AUCTION_PRICE}",
 			AdMarkup:   "<html/>",
-			AdvDomain:  []string{"ads.com"},
-			IURL:       "http://ads.com/112770_1386565997.jpeg",
+			AdvDomains: []string{"ads.com"},
+			ImageURL:   "http://ads.com/112770_1386565997.jpeg",
 			CampaignID: "52a5516d29e435137c6f6e74",
 			CreativeID: "52a5516d29e435137c6f6e74_1386565997",
 			DealID:     "example_deal",
-			Attr:       []int{},
+			Attrs:      []CreativeAttribute{},
 		}))
 	})
 
diff --git a/bidrequest.go b/bidrequest.go
index 41fbd0e..d8d6873 100644
--- a/bidrequest.go
+++ b/bidrequest.go
@@ -12,45 +12,44 @@ var (
 	ErrInvalidReqMultiInv = errors.New("openrtb: request has multiple inventory sources") // has site and app
 )
 
-// The top-level bid request object contains a globally unique bid request or auction ID.  This "id"
+// BidRequest is the top-level bid request object contains a globally unique bid request or auction ID.  This "id"
 // attribute is required as is at least one "imp" (i.e., impression) object.  Other attributes are
 // optional since an exchange may establish default values.
 type BidRequest struct {
-	ID          string          `json:"id"` // Unique ID of the bid request
-	Imp         []Impression    `json:"imp,omitempty"`
-	Site        *Site           `json:"site,omitempty"`
-	App         *App            `json:"app,omitempty"`
-	Device      *Device         `json:"device,omitempty"`
-	User        *User           `json:"user,omitempty"`
-	Test        int             `json:"test,omitempty"`    // Indicator of test mode in which auctions are not billable, where 0 = live mode, 1 = test mode
-	AuctionType int             `json:"at"`                // Auction type, where 1 = First Price, 2 = Second Price Plus. Exchange-specific auction types can be defined using values greater than 500.
-	TMax        int             `json:"tmax,omitempty"`    // Maximum amount of time in milliseconds to submit a bid
-	WSeat       []string        `json:"wseat,omitempty"`   // Array of buyer seats allowed to bid on this auction
-	BSeat       []string        `json:"bseat,omitempty"`   // Array of buyer seats blocked to bid on this auction
-	WLang       []string        `json:"wlang,omitempty"`   // Array of languages for creatives using ISO-639-1-alpha-2
-	AllImps     int             `json:"allimps,omitempty"` // Flag to indicate whether exchange can verify that all impressions offered represent all of the impressions available in context, Default: 0
-	Cur         []string        `json:"cur,omitempty"`     // Array of allowed currencies
-	Bcat        []string        `json:"bcat,omitempty"`    // Blocked Advertiser Categories.
-	BAdv        []string        `json:"badv,omitempty"`    // Array of strings of blocked toplevel domains of advertisers
-	BApp        []string        `json:"bapp,omitempty"`    // Block list of applications by their platform-specific exchange-independent application identifiers. On Android, these should be bundle or package names (e.g., com.foo.mygame).  On iOS, these are numeric IDs.
-	Source      *Source         `json:"source,omitempty"`  // A Source object that provides data about the inventory source and which entity makes the final decision
-	Regs        *Regulations    `json:"regs,omitempty"`
-	Ext         json.RawMessage `json:"ext,omitempty"`
-
-	Pmp *Pmp `json:"pmp,omitempty"` // DEPRECATED: kept for backwards compatibility
+	ID                string            `json:"id"` // Unique ID of the bid request
+	Impressions       []Impression      `json:"imp,omitempty"`
+	Site              *Site             `json:"site,omitempty"`
+	App               *App              `json:"app,omitempty"`
+	Device            *Device           `json:"device,omitempty"`
+	User              *User             `json:"user,omitempty"`
+	Test              int               `json:"test,omitempty"`    // Indicator of test mode in which auctions are not billable, where 0 = live mode, 1 = test mode
+	AuctionType       int               `json:"at"`                // Auction type, where 1 = First Price, 2 = Second Price Plus. Exchange-specific auction types can be defined using values greater than 500.
+	TimeMax           int               `json:"tmax,omitempty"`    // Maximum amount of time in milliseconds to submit a bid
+	Seats             []string          `json:"wseat,omitempty"`   // Array of buyer seats allowed to bid on this auction
+	BlockedSeats      []string          `json:"bseat,omitempty"`   // Array of buyer seats blocked to bid on this auction
+	Languages         []string          `json:"wlang,omitempty"`   // Array of languages for creatives using ISO-639-1-alpha-2
+	AllImpressions    int               `json:"allimps,omitempty"` // Flag to indicate whether exchange can verify that all impressions offered represent all of the impressions available in context, Default: 0
+	Currencies        []string          `json:"cur,omitempty"`     // Array of allowed currencies
+	BlockedCategories []ContentCategory `json:"bcat,omitempty"`    // Blocked Advertiser Categories.
+	BlockedAdvDomains []string          `json:"badv,omitempty"`    // Array of strings of blocked toplevel domains of advertisers
+	BlockedApps       []string          `json:"bapp,omitempty"`    // Block list of applications by their platform-specific exchange-independent application identifiers. On Android, these should be bundle or package names (e.g., com.foo.mygame).  On iOS, these are numeric IDs.
+	Source            *Source           `json:"source,omitempty"`  // A Source object that provides data about the inventory source and which entity makes the final decision
+	Regulations       *Regulations      `json:"regs,omitempty"`
+	Ext               json.RawMessage   `json:"ext,omitempty"`
 }
 
-// Validates the request
+// Validate the request
 func (req *BidRequest) Validate() error {
 	if req.ID == "" {
 		return ErrInvalidReqNoID
-	} else if len(req.Imp) == 0 {
+	} else if len(req.Impressions) == 0 {
 		return ErrInvalidReqNoImps
 	} else if req.Site != nil && req.App != nil {
 		return ErrInvalidReqMultiInv
 	}
 
-	for _, imp := range req.Imp {
+	for i := range req.Impressions {
+		imp := req.Impressions[i]
 		if err := (&imp).Validate(); err != nil {
 			return err
 		}
diff --git a/bidrequest_test.go b/bidrequest_test.go
index 68dc085..88131c3 100644
--- a/bidrequest_test.go
+++ b/bidrequest_test.go
@@ -8,9 +8,9 @@ import (
 var _ = Describe("BidRequest", func() {
 	var subject *BidRequest
 	privacyPolicy := 1
+
 	BeforeEach(func() {
-		err := fixture("breq.banner", &subject)
-		Expect(err).NotTo(HaveOccurred())
+		Expect(fixture("breq.banner", &subject)).To(Succeed())
 	})
 
 	It("should parse complex requests", func() {
@@ -25,11 +25,11 @@ var _ = Describe("BidRequest", func() {
 	It("should parse correctly", func() {
 		Expect(subject).To(Equal(&BidRequest{
 			ID: "1234534625254",
-			Imp: []Impression{
+			Impressions: []Impression{
 				{
 					ID:     "1",
 					Secure: 1,
-					Banner: &Banner{W: 300, H: 250, Pos: AdPosAboveFold, BAttr: []int{CreativeAttributeUserInitiated}},
+					Banner: &Banner{Width: 300, Height: 250, Position: AdPositionAboveFold, BlockedAttrs: []CreativeAttribute{CreativeAttributeUserInitiated}},
 				},
 			},
 			Site: &Site{
@@ -37,42 +37,42 @@ var _ = Describe("BidRequest", func() {
 					ID:            "234563",
 					Name:          "Site ABCD",
 					Domain:        "siteabcd.com",
-					Cat:           []string{"IAB2-1", "IAB2-2"},
+					Categories:    []ContentCategory{ContentCategoryAutoParts, ContentCategoryAutoRepair},
 					Publisher:     &Publisher{ID: "pub12345", Name: "Publisher A"},
 					PrivacyPolicy: &privacyPolicy,
 					Content: &Content{
 						Keywords: "keyword a,keyword b,keyword c",
 					},
 				},
-				Page: "http://siteabcd.com/page.htm",
-				Ref:  "http://referringsite.com/referringpage.htm",
+				Page:     "http://siteabcd.com/page.htm",
+				Referrer: "http://referringsite.com/referringpage.htm",
 			},
 			Device: &Device{
-				UA:       "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.2.16) Gecko/20110319 Firefox/3.6.16",
-				IP:       "64.124.253.1",
-				OS:       "OS X",
-				JS:       1,
-				FlashVer: "10.1",
+				UA:           "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.2.16) Gecko/20110319 Firefox/3.6.16",
+				IP:           "64.124.253.1",
+				OS:           "OS X",
+				JS:           1,
+				FlashVersion: "10.1",
 			},
 			User: &User{
 				ID:       "45asdf987656789adfad4678rew656789",
 				BuyerUID: "5df678asd8987656asdf78987654",
 			},
-			Test:        1,
-			AuctionType: 2,
-			TMax:        120,
-			BAdv:        []string{"company1.com", "company2.com"},
+			Test:              1,
+			AuctionType:       2,
+			TimeMax:           120,
+			BlockedAdvDomains: []string{"company1.com", "company2.com"},
 		}))
 	})
 
 	It("should validate", func() {
 		Expect((&BidRequest{}).Validate()).To(Equal(ErrInvalidReqNoID))
 		Expect((&BidRequest{ID: "A"}).Validate()).To(Equal(ErrInvalidReqNoImps))
-		Expect((&BidRequest{ID: "A", Imp: []Impression{{ID: "1"}}, Site: &Site{}, App: &App{}}).Validate()).To(Equal(ErrInvalidReqMultiInv))
+		Expect((&BidRequest{ID: "A", Impressions: []Impression{{ID: "1"}}, Site: &Site{}, App: &App{}}).Validate()).To(Equal(ErrInvalidReqMultiInv))
 
-		Expect((&BidRequest{ID: "A", Imp: []Impression{{ID: "1", Banner: &Banner{}}}}).Validate()).NotTo(HaveOccurred())
-		Expect((&BidRequest{ID: "A", Imp: []Impression{{ID: "1", Banner: &Banner{}}}, Site: &Site{}}).Validate()).NotTo(HaveOccurred())
-		Expect((&BidRequest{ID: "A", Imp: []Impression{{ID: "1", Banner: &Banner{}}}, App: &App{}}).Validate()).NotTo(HaveOccurred())
+		Expect((&BidRequest{ID: "A", Impressions: []Impression{{ID: "1", Banner: &Banner{}}}}).Validate()).NotTo(HaveOccurred())
+		Expect((&BidRequest{ID: "A", Impressions: []Impression{{ID: "1", Banner: &Banner{}}}, Site: &Site{}}).Validate()).NotTo(HaveOccurred())
+		Expect((&BidRequest{ID: "A", Impressions: []Impression{{ID: "1", Banner: &Banner{}}}, App: &App{}}).Validate()).NotTo(HaveOccurred())
 		Expect(subject.Validate()).NotTo(HaveOccurred())
 	})
 
diff --git a/bidresponse.go b/bidresponse.go
index 31d07af..58dde72 100644
--- a/bidresponse.go
+++ b/bidresponse.go
@@ -11,17 +11,18 @@ var (
 	ErrInvalidRespNoSeatBids = errors.New("openrtb: response missing seatbids")
 )
 
+// BidResponse is the bid response wrapper object.
 // ID and at least one "seatbid” object is required, which contains a bid on at least one impression.
 // Other attributes are optional since an exchange may establish default values.
 // No-Bids on all impressions should be indicated as a HTTP 204 response.
 // For no-bids on specific impressions, the bidder should omit these from the bid response.
 type BidResponse struct {
 	ID         string          `json:"id"`                   // Reflection of the bid request ID for logging purposes
-	SeatBid    []SeatBid       `json:"seatbid"`              // Array of seatbid objects
+	SeatBids   []SeatBid       `json:"seatbid"`              // Array of seatbid objects
 	BidID      string          `json:"bidid,omitempty"`      // Optional response tracking ID for bidders
 	Currency   string          `json:"cur,omitempty"`        // Bid currency
 	CustomData string          `json:"customdata,omitempty"` // Encoded user features
-	NBR        int             `json:"nbr,omitempty"`        // Reason for not bidding, where 0 = unknown error, 1 = technical error, 2 = invalid request, 3 = known web spider, 4 = suspected Non-Human Traffic, 5 = cloud, data center, or proxy IP, 6 = unsupported device, 7 = blocked publisher or site, 8 = unmatched user
+	NBR        NBR             `json:"nbr,omitempty"`        // Reason for not bidding, where 0 = unknown error, 1 = technical error, 2 = invalid request, 3 = known web spider, 4 = suspected Non-Human Traffic, 5 = cloud, data center, or proxy IP, 6 = unsupported device, 7 = blocked publisher or site, 8 = unmatched user
 	Ext        json.RawMessage `json:"ext,omitempty"`        // Custom specifications in JSon
 }
 
@@ -29,15 +30,15 @@ type BidResponse struct {
 func (res *BidResponse) Validate() error {
 	if res.ID == "" {
 		return ErrInvalidRespNoID
-	} else if len(res.SeatBid) == 0 {
+	} else if len(res.SeatBids) == 0 {
 		return ErrInvalidRespNoSeatBids
 	}
 
-	for _, sb := range res.SeatBid {
-		if err := sb.Validate(); err != nil {
+	for i := range res.SeatBids {
+		sb := res.SeatBids[i]
+		if err := (&sb).Validate(); err != nil {
 			return err
 		}
 	}
-
 	return nil
 }
diff --git a/bidresponse_test.go b/bidresponse_test.go
index 8f81f17..3b94222 100644
--- a/bidresponse_test.go
+++ b/bidresponse_test.go
@@ -9,15 +9,13 @@ var _ = Describe("BidResponse", func() {
 	var subject *BidResponse
 
 	BeforeEach(func() {
-		err := fixture("bres.single", &subject)
-		Expect(err).NotTo(HaveOccurred())
+		Expect(fixture("bres.single", &subject)).To(Succeed())
 	})
 
 	It("should parse complex responses", func() {
 		for _, kind := range []string{"multi", "pmp", "vast"} {
 			var req *BidResponse
-			err := fixture("bres."+kind, &req)
-			Expect(err).NotTo(HaveOccurred(), "for %s", kind)
+			Expect(fixture("bres."+kind, &req)).To(Succeed(), "for %s", kind)
 			Expect(req.Validate()).NotTo(HaveOccurred(), "for %s", kind)
 		}
 	})
@@ -25,20 +23,20 @@ var _ = Describe("BidResponse", func() {
 	It("should parse responses", func() {
 		Expect(subject).To(Equal(&BidResponse{
 			ID: "BID-4-ZIMP-4b309eae-504a-4252-a8a8-4c8ceee9791a",
-			SeatBid: []SeatBid{
+			SeatBids: []SeatBid{
 				{
-					Bid: []Bid{
+					Bids: []Bid{
 						{
 							ID:         "32a69c6ba388f110487f9d1e63f77b22d86e916b",
 							ImpID:      "32a69c6ba388f110487f9d1e63f77b22d86e916b",
 							Price:      0.065445,
 							AdID:       "529833ce55314b19e8796116",
-							NURL:       "http://ads.com/win/529833ce55314b19e8796116?won=${auction_price}",
+							NoticeURL:  "http://ads.com/win/529833ce55314b19e8796116?won=${auction_price}",
 							AdMarkup:   "<iframe src=\"foo.bar\"/>",
-							AdvDomain:  []string{},
+							AdvDomains: []string{},
 							CampaignID: "529833ce55314b19e8796116",
 							CreativeID: "529833ce55314b19e8796116_1385706446",
-							Attr:       []int{},
+							Attrs:      []CreativeAttribute{},
 						},
 					},
 					Seat: "772",
@@ -53,5 +51,4 @@ var _ = Describe("BidResponse", func() {
 		Expect((&BidResponse{ID: "RESPID"}).Validate()).To(Equal(ErrInvalidRespNoSeatBids))
 		Expect(subject.Validate()).NotTo(HaveOccurred())
 	})
-
 })
diff --git a/content.go b/content.go
index e24a709..6c5ba4e 100644
--- a/content.go
+++ b/content.go
@@ -2,36 +2,36 @@ package openrtb
 
 import "encoding/json"
 
-// This object describes the content in which the impression will appear, which may be syndicated or nonsyndicated
+// Content object describes the content in which the impression will appear, which may be syndicated or nonsyndicated
 // content. This object may be useful when syndicated content contains impressions and does
 // not necessarily match the publisher's general content. The exchange might or might not have
 // knowledge of the page where the content is running, as a result of the syndication method. For
 // example might be a video impression embedded in an iframe on an unknown web property or device.
 type Content struct {
-	ID                 string          `json:"id,omitempty"`                 // ID uniquely identifying the content.
-	Episode            int             `json:"episode,omitempty"`            // Episode number (typically applies to video content).
-	Title              string          `json:"title,omitempty"`              // Content title.
-	Series             string          `json:"series,omitempty"`             // Content series.
-	Season             string          `json:"season,omitempty"`             // Content season.
-	Artist             string          `json:"artist,omitempty"`             // Artist credited with the content.
-	Genre              string          `json:"genre,omitempty"`              // Genre that best describes the content
-	Album              string          `json:"album,omitempty"`              // Album to which the content belongs; typically for audio.
-	ISRC               string          `json:"isrc,omitempty"`               // International Standard Recording Code conforming to ISO - 3901.
-	Producer           *Producer       `json:"producer,omitempty"`           // The producer.
-	URL                string          `json:"url,omitempty"`                // URL of the content, for buy-side contextualization or review.
-	Cat                []string        `json:"cat,omitempty"`                // Array of IAB content categories that describe the content.
-	ProdQuality        int             `json:"prodq,omitempty"`              // Production quality per IAB's classification.
-	VideoQuality       int             `json:"videoquality,omitempty"`       // Video quality per IAB's classification.
-	Context            NumberOrString  `json:"context,omitempty"`            // Type of content (game, video, text, etc.).
-	ContentRating      string          `json:"contentrating,omitempty"`      // Content rating (e.g., MPAA).
-	UserRating         string          `json:"userrating,omitempty"`         // User rating of the content (e.g., number of stars, likes, etc.).
-	QAGMediaRating     int             `json:"qagmediarating,omitempty"`     // Media rating per QAG guidelines.
-	Keywords           string          `json:"keywords,omitempty"`           // Comma separated list of keywords describing the content.
-	LiveStream         int             `json:"livestream,omitempty"`         // 0 = not live, 1 = content is live (e.g., stream, live blog).
-	SourceRelationship int             `json:"sourcerelationship,omitempty"` // 0 = indirect, 1 = direct.
-	Len                int             `json:"len,omitempty"`                // Length of content in seconds; appropriate for video or audio.
-	Language           string          `json:"language,omitempty"`           // Content language using ISO-639-1-alpha-2.
-	Embeddable         int             `json:"embeddable,omitempty"`         // Indicator of whether or not the content is embeddable (e.g., an embeddable video player), where 0 = no, 1 = yes.
-	Data               []Data          `json:"data,omitempty"`               // Additional content data.
-	Ext                json.RawMessage `json:"ext,omitempty"`
+	ID                 string            `json:"id,omitempty"`                 // ID uniquely identifying the content.
+	Episode            int               `json:"episode,omitempty"`            // Episode number (typically applies to video content).
+	Title              string            `json:"title,omitempty"`              // Content title.
+	Series             string            `json:"series,omitempty"`             // Content series.
+	Season             string            `json:"season,omitempty"`             // Content season.
+	Artist             string            `json:"artist,omitempty"`             // Artist credited with the content.
+	Genre              string            `json:"genre,omitempty"`              // Genre that best describes the content
+	Album              string            `json:"album,omitempty"`              // Album to which the content belongs; typically for audio.
+	ISRC               string            `json:"isrc,omitempty"`               // International Standard Recording Code conforming to ISO - 3901.
+	Producer           *Producer         `json:"producer,omitempty"`           // The producer.
+	URL                string            `json:"url,omitempty"`                // URL of the content, for buy-side contextualization or review.
+	Categories         []ContentCategory `json:"cat,omitempty"`                // Array of IAB content categories that describe the content.
+	ProductionQuality  ProductionQuality `json:"prodq,omitempty"`              // Production quality per IAB's classification.
+	VideoQuality       ProductionQuality `json:"videoquality,omitempty"`       // DEPRECATED. Video quality per IAB's classification.
+	Context            ContentContext    `json:"context,omitempty"`            // Type of content (game, video, text, etc.).
+	ContentRating      string            `json:"contentrating,omitempty"`      // Content rating (e.g., MPAA).
+	UserRating         string            `json:"userrating,omitempty"`         // User rating of the content (e.g., number of stars, likes, etc.).
+	MediaRating        IQGRating         `json:"qagmediarating,omitempty"`     // Media rating per QAG guidelines.
+	Keywords           string            `json:"keywords,omitempty"`           // Comma separated list of keywords describing the content.
+	LiveStream         int               `json:"livestream,omitempty"`         // 0 = not live, 1 = content is live (e.g., stream, live blog).
+	SourceRelationship int               `json:"sourcerelationship,omitempty"` // 0 = indirect, 1 = direct.
+	Length             int               `json:"len,omitempty"`                // Length of content in seconds; appropriate for video or audio.
+	Language           string            `json:"language,omitempty"`           // Content language using ISO-639-1-alpha-2.
+	Embeddable         int               `json:"embeddable,omitempty"`         // Indicator of whether or not the content is embeddable (e.g., an embeddable video player), where 0 = no, 1 = yes.
+	Data               []Data            `json:"data,omitempty"`               // Additional content data.
+	Ext                json.RawMessage   `json:"ext,omitempty"`
 }
diff --git a/content_test.go b/content_test.go
index fe51e4b..dadd4d8 100644
--- a/content_test.go
+++ b/content_test.go
@@ -9,8 +9,7 @@ var _ = Describe("Content", func() {
 	var subject *Content
 
 	BeforeEach(func() {
-		err := fixture("content", &subject)
-		Expect(err).NotTo(HaveOccurred())
+		Expect(fixture("content", &subject)).To(Succeed())
 	})
 
 	It("should parse correctly", func() {
@@ -24,15 +23,13 @@ var _ = Describe("Content", func() {
 			},
 		}))
 	})
-
 })
 
 var _ = Describe("QuotedContent", func() {
 	var subject *Content
 
 	BeforeEach(func() {
-		err := fixture("content.quoted", &subject)
-		Expect(err).NotTo(HaveOccurred())
+		Expect(fixture("content.quoted", &subject)).To(Succeed())
 	})
 
 	It("should parse correctly", func() {
@@ -44,7 +41,7 @@ var _ = Describe("QuotedContent", func() {
 			URL:                "http://cdnp.tremormedia.com/video/1984.flv",
 			LiveStream:         0,
 			ContentRating:      "G",
-			Len:                129,
+			Length:             129,
 			Series:             "book reading",
 			VideoQuality:       2,
 			Context:            1,
@@ -53,5 +50,4 @@ var _ = Describe("QuotedContent", func() {
 			ID:                 "eb9f13ede5fd225333971523f6042f9d",
 		}))
 	})
-
 })
diff --git a/device.go b/device.go
index 50f1813..19da613 100644
--- a/device.go
+++ b/device.go
@@ -2,39 +2,39 @@ package openrtb
 
 import "encoding/json"
 
-// The "device" object provides information pertaining to the device including its hardware,
+// Device object provides information pertaining to the device including its hardware,
 // platform, location, and carrier. This device can refer to a mobile handset, a desktop computer,
 // set top box or other digital device.
 type Device struct {
-	UA         string          `json:"ua,omitempty"`             // User agent
-	Geo        *Geo            `json:"geo,omitempty"`            // Location of the device assumed to be the user’s current location
-	DNT        int             `json:"dnt,omitempty"`            // "1": Do not track
-	LMT        int             `json:"lmt,omitempty"`            // "1": Limit Ad Tracking
-	IP         string          `json:"ip,omitempty"`             // IPv4
-	IPv6       string          `json:"ipv6,omitempty"`           // IPv6
-	DeviceType int             `json:"devicetype,omitempty"`     // The general type of device.
-	Make       string          `json:"make,omitempty"`           // Device make
-	Model      string          `json:"model,omitempty"`          // Device model
-	OS         string          `json:"os,omitempty"`             // Device OS
-	OSVer      string          `json:"osv,omitempty"`            // Device OS version
-	HwVer      string          `json:"hwv,omitempty"`            // Hardware version of the device (e.g., "5S" for iPhone 5S).
-	H          int             `json:"h,omitempty"`              // Physical height of the screen in pixels.
-	W          int             `json:"w,omitempty"`              // Physical width of the screen in pixels.
-	PPI        int             `json:"ppi,omitempty"`            // Screen size as pixels per linear inch.
-	PxRatio    float64         `json:"pxratio,omitempty"`        // The ratio of physical pixels to device independent pixels.
-	JS         int             `json:"js,omitempty"`             // Javascript status ("0": Disabled, "1": Enabled)
-	GeoFetch   int             `json:"geofetch,omitempty"`       // Indicates if the geolocation API will be available to JavaScript code running in the banner,
-	FlashVer   string          `json:"flashver,omitempty"`       // Flash version
-	Language   string          `json:"language,omitempty"`       // Browser language
-	Carrier    string          `json:"carrier,omitempty"`        // Carrier or ISP derived from the IP address
-	MCCMNC     string          `json:"mccmnc,omitempty"`         // Mobile carrier as the concatenated MCC-MNC code (e.g., "310-005" identifies Verizon Wireless CDMA in the USA).
-	ConnType   int             `json:"connectiontype,omitempty"` // Network connection type.
-	IFA        string          `json:"ifa,omitempty"`            // Native identifier for advertisers
-	IDSHA1     string          `json:"didsha1,omitempty"`        // SHA1 hashed device ID
-	IDMD5      string          `json:"didmd5,omitempty"`         // MD5 hashed device ID
-	PIDSHA1    string          `json:"dpidsha1,omitempty"`       // SHA1 hashed platform device ID
-	PIDMD5     string          `json:"dpidmd5,omitempty"`        // MD5 hashed platform device ID
-	MacSHA1    string          `json:"macsha1,omitempty"`        // SHA1 hashed device ID; IMEI when available, else MEID or ESN
-	MacMD5     string          `json:"macmd5,omitempty"`         // MD5 hashed device ID; IMEI when available, else MEID or ESN
-	Ext        json.RawMessage `json:"ext,omitempty"`
+	UA           string          `json:"ua,omitempty"`             // User agent
+	Geo          *Geo            `json:"geo,omitempty"`            // Location of the device assumed to be the user’s current location
+	DNT          int             `json:"dnt,omitempty"`            // "1": Do not track
+	LMT          int             `json:"lmt,omitempty"`            // "1": Limit Ad Tracking
+	IP           string          `json:"ip,omitempty"`             // IPv4
+	IPv6         string          `json:"ipv6,omitempty"`           // IPv6
+	DeviceType   DeviceType      `json:"devicetype,omitempty"`     // The general type of device.
+	Make         string          `json:"make,omitempty"`           // Device make
+	Model        string          `json:"model,omitempty"`          // Device model
+	OS           string          `json:"os,omitempty"`             // Device OS
+	OSVersion    string          `json:"osv,omitempty"`            // Device OS version
+	HWVersion    string          `json:"hwv,omitempty"`            // Hardware version of the device (e.g., "5S" for iPhone 5S).
+	Height       int             `json:"h,omitempty"`              // Physical height of the screen in pixels.
+	Width        int             `json:"w,omitempty"`              // Physical width of the screen in pixels.
+	PPI          int             `json:"ppi,omitempty"`            // Screen size as pixels per linear inch.
+	PixelRatio   float64         `json:"pxratio,omitempty"`        // The ratio of physical pixels to device independent pixels.
+	JS           int             `json:"js,omitempty"`             // Javascript status ("0": Disabled, "1": Enabled)
+	GeoFetch     int             `json:"geofetch,omitempty"`       // Indicates if the geolocation API will be available to JavaScript code running in the banner,
+	FlashVersion string          `json:"flashver,omitempty"`       // Flash version
+	Language     string          `json:"language,omitempty"`       // Browser language
+	Carrier      string          `json:"carrier,omitempty"`        // Carrier or ISP derived from the IP address
+	MCCMNC       string          `json:"mccmnc,omitempty"`         // Mobile carrier as the concatenated MCC-MNC code (e.g., "310-005" identifies Verizon Wireless CDMA in the USA).
+	ConnType     ConnType        `json:"connectiontype,omitempty"` // Network connection type.
+	IFA          string          `json:"ifa,omitempty"`            // Native identifier for advertisers
+	IDSHA1       string          `json:"didsha1,omitempty"`        // SHA1 hashed device ID
+	IDMD5        string          `json:"didmd5,omitempty"`         // MD5 hashed device ID
+	PIDSHA1      string          `json:"dpidsha1,omitempty"`       // SHA1 hashed platform device ID
+	PIDMD5       string          `json:"dpidmd5,omitempty"`        // MD5 hashed platform device ID
+	MacSHA1      string          `json:"macsha1,omitempty"`        // SHA1 hashed device ID; IMEI when available, else MEID or ESN
+	MacMD5       string          `json:"macmd5,omitempty"`         // MD5 hashed device ID; IMEI when available, else MEID or ESN
+	Ext          json.RawMessage `json:"ext,omitempty"`
 }
diff --git a/device_test.go b/device_test.go
index c713c3f..8a3e3be 100644
--- a/device_test.go
+++ b/device_test.go
@@ -9,8 +9,7 @@ var _ = Describe("Device", func() {
 	var subject *Device
 
 	BeforeEach(func() {
-		err := fixture("device", &subject)
-		Expect(err).NotTo(HaveOccurred())
+		Expect(fixture("device", &subject)).To(Succeed())
 	})
 
 	It("should parse correctly", func() {
@@ -19,13 +18,13 @@ var _ = Describe("Device", func() {
 			UA:  "Mozilla/5.0 (iPhone; CPU iPhone OS 6_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A334 Safari/7534.48.3",
 			IP:  "123.145.167.189",
 			Geo: &Geo{
-				Lat:     35.012345,
-				Lon:     -115.12345,
-				Country: "USA",
-				Region:  "CA",
-				Metro:   "803",
-				City:    "Los Angeles",
-				Zip:     "90049",
+				Latitude:  35.012345,
+				Longitude: -115.12345,
+				Country:   "USA",
+				Region:    "CA",
+				Metro:     "803",
+				City:      "Los Angeles",
+				ZIP:       "90049",
 			},
 			PIDSHA1:    "AA000DFE74168477C70D291f574D344790E0BB11",
 			PIDMD5:     "AA003EABFB29E6F759F3BDAB34E50BB11",
@@ -34,7 +33,7 @@ var _ = Describe("Device", func() {
 			Make:       "Apple",
 			Model:      "iPhone",
 			OS:         "iOS",
-			OSVer:      "6.1",
+			OSVersion:      "6.1",
 			JS:         1,
 			ConnType:   ConnTypeCell,
 			MCCMNC:     "722-341",
diff --git a/doc.go b/doc.go
index de7b323..629162e 100644
--- a/doc.go
+++ b/doc.go
@@ -1,5 +1,5 @@
 /*
-This package implements a parser (with optional validation) and a generator for
+Package openrtb implements a parser (with optional validation) and a generator for
 OpenRTB 2.x requests and responses.
 */
 package openrtb
diff --git a/go.mod b/go.mod
index c327b7a..f433fa1 100644
--- a/go.mod
+++ b/go.mod
@@ -1,13 +1,8 @@
-module github.com/bsm/openrtb
+module github.com/bsm/openrtb/v3
+
+go 1.13
 
 require (
-	github.com/golang/protobuf v1.3.2 // indirect
-	github.com/kr/pretty v0.1.0 // indirect
-	github.com/onsi/ginkgo v1.8.0
-	github.com/onsi/gomega v1.5.0
-	golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7 // indirect
-	golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // indirect
-	golang.org/x/text v0.3.2 // indirect
-	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
-	gopkg.in/yaml.v2 v2.2.2 // indirect
+	github.com/onsi/ginkgo v1.10.2
+	github.com/onsi/gomega v1.7.0
 )
diff --git a/go.sum b/go.sum
index d177504..47ebf2d 100644
--- a/go.sum
+++ b/go.sum
@@ -1,44 +1,27 @@
 github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.8.0 h1:VkHVNpR4iVnU8XQR6DBm8BqYjN7CRzw+xKUbVVbbW9w=
-github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo=
-github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+github.com/onsi/ginkgo v1.10.2 h1:uqH7bpe+ERSiDa34FDOF7RikN6RzXgduUF8yarlZp94=
+github.com/onsi/ginkgo v1.10.2/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/gomega v1.7.0 h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME=
+github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd h1:nTDtHvHSdCn1m6ITfMRqtOd/9+7a3s8RBNOZ3eYZzJA=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7 h1:fHDIZ2oxGnUZRN6WgWFCbYBjH9uqVPRCUVUDhs0wnbA=
-golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e h1:o3PsSEY8E4eXWkXrIP9YJALUkVZqzHJT5DOasTyn8Vs=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO9UxmJRx8K0gsfABByQ=
-golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/impression.go b/impression.go
index 97b4dec..eeaee85 100644
--- a/impression.go
+++ b/impression.go
@@ -11,7 +11,7 @@ var (
 	ErrInvalidImpMultiAssets = errors.New("openrtb: impression has multiple assets") // at least two out of Banner, Video, Native
 )
 
-// The "imp" object describes the ad position or impression being auctioned.  A single bid request
+// Impression or the "imp" object describes the ad position or impression being auctioned. A single bid request
 // can include multiple "imp" objects, a use case for which might be an exchange that supports
 // selling all ad positions on a given page as a bundle.  Each "imp" object has a required ID so that
 // bids can reference them individually.  An exchange can also conduct private auctions by
@@ -19,22 +19,22 @@ var (
 // The presence of Banner, Video, and/or Native objects
 // subordinate to the Imp object indicates the type of impression being offered.
 type Impression struct {
-	ID                string          `json:"id"` // A unique identifier for this impression
-	Banner            *Banner         `json:"banner,omitempty"`
-	Video             *Video          `json:"video,omitempty"`
-	Audio             *Audio          `json:"audio,omitempty"`
-	Native            *Native         `json:"native,omitempty"`
-	Pmp               *Pmp            `json:"pmp,omitempty"`               // A reference to the PMP object containing any Deals eligible for the impression object.
-	DisplayManager    string          `json:"displaymanager,omitempty"`    // Name of ad mediation partner, SDK technology, etc
-	DisplayManagerVer string          `json:"displaymanagerver,omitempty"` // Version of the above
-	Instl             int             `json:"instl,omitempty"`             // Interstitial, Default: 0 ("1": Interstitial, "0": Something else)
-	TagID             string          `json:"tagid,omitempty"`             // IDentifier for specific ad placement or ad tag
-	BidFloor          float64         `json:"bidfloor,omitempty"`          // Bid floor for this impression in CPM
-	BidFloorCurrency  string          `json:"bidfloorcur,omitempty"`       // Currency of bid floor
-	Secure            NumberOrString  `json:"secure,omitempty"`            // Flag to indicate whether the impression requires secure HTTPS URL creative assets and markup.
-	Exp               int             `json:"exp,omitempty"`               // Advisory as to the number of seconds that may elapse between the auction and the actual impression.
-	IFrameBuster      []string        `json:"iframebuster,omitempty"`      // Array of names for supportediframe busters.
-	Ext               json.RawMessage `json:"ext,omitempty"`
+	ID                    string          `json:"id"` // A unique identifier for this impression
+	Banner                *Banner         `json:"banner,omitempty"`
+	Video                 *Video          `json:"video,omitempty"`
+	Audio                 *Audio          `json:"audio,omitempty"`
+	Native                *Native         `json:"native,omitempty"`
+	PMP                   *PMP            `json:"pmp,omitempty"`               // A reference to the PMP object containing any Deals eligible for the impression object.
+	DisplayManager        string          `json:"displaymanager,omitempty"`    // Name of ad mediation partner, SDK technology, etc
+	DisplayManagerVersion string          `json:"displaymanagerver,omitempty"` // Version of the above
+	Interstitial          int             `json:"instl,omitempty"`             // Interstitial, Default: 0 ("1": Interstitial, "0": Something else)
+	TagID                 string          `json:"tagid,omitempty"`             // IDentifier for specific ad placement or ad tag
+	BidFloor              float64         `json:"bidfloor,omitempty"`          // Bid floor for this impression in CPM
+	BidFloorCurrency      string          `json:"bidfloorcur,omitempty"`       // Currency of bid floor
+	Secure                NumberOrString  `json:"secure,omitempty"`            // Flag to indicate whether the impression requires secure HTTPS URL creative assets and markup.
+	Exp                   int             `json:"exp,omitempty"`               // Advisory as to the number of seconds that may elapse between the auction and the actual impression.
+	IFrameBusters         []string        `json:"iframebuster,omitempty"`      // Array of names for supportediframe busters.
+	Ext                   json.RawMessage `json:"ext,omitempty"`
 }
 
 func (imp *Impression) assetCount() int {
@@ -51,7 +51,7 @@ func (imp *Impression) assetCount() int {
 	return n
 }
 
-// Validates the `imp` object
+// Validate the `imp` object
 func (imp *Impression) Validate() error {
 	if imp.ID == "" {
 		return ErrInvalidImpNoID
diff --git a/impression_test.go b/impression_test.go
index 93777ff..5f992dc 100644
--- a/impression_test.go
+++ b/impression_test.go
@@ -9,19 +9,18 @@ var _ = Describe("Impression", func() {
 	var subject *Impression
 
 	BeforeEach(func() {
-		err := fixture("impression", &subject)
-		Expect(err).NotTo(HaveOccurred())
+		Expect(fixture("impression", &subject)).To(Succeed())
 	})
 
 	It("should parse correctly", func() {
 		Expect(subject).To(Equal(&Impression{
 			ID: "1",
 			Banner: &Banner{
-				W: 300,
-				H: 250,
+				Width: 300,
+				Height: 250,
 			},
 			BidFloor: 0.03,
-			Pmp: &Pmp{
+			PMP: &PMP{
 				Private: 1,
 				Deals: []Deal{
 					{
diff --git a/inventory.go b/inventory.go
index 0a02e17..29b33f9 100644
--- a/inventory.go
+++ b/inventory.go
@@ -2,18 +2,19 @@ package openrtb
 
 import "encoding/json"
 
+// Inventory contains inventory specific attributes
 type Inventory struct {
-	ID            string          `json:"id,omitempty"` // ID on the exchange
-	Name          string          `json:"name,omitempty"`
-	Domain        string          `json:"domain,omitempty"`
-	Cat           []string        `json:"cat,omitempty"`           // Array of IAB content categories
-	SectionCat    []string        `json:"sectioncat,omitempty"`    // Array of IAB content categories for subsection
-	PageCat       []string        `json:"pagecat,omitempty"`       // Array of IAB content categories for page
-	PrivacyPolicy *int            `json:"privacypolicy,omitempty"` // Default: 1 ("1": has a privacy policy)
-	Publisher     *Publisher      `json:"publisher,omitempty"`     // Details about the Publisher
-	Content       *Content        `json:"content,omitempty"`       // Details about the Content
-	Keywords      string          `json:"keywords,omitempty"`      // Comma separated list of keywords about the site.
-	Ext           json.RawMessage `json:"ext,omitempty"`
+	ID                string            `json:"id,omitempty"` // ID on the exchange
+	Name              string            `json:"name,omitempty"`
+	Domain            string            `json:"domain,omitempty"`
+	Categories        []ContentCategory `json:"cat,omitempty"`           // Array of IAB content categories
+	SectionCategories []ContentCategory `json:"sectioncat,omitempty"`    // Array of IAB content categories for subsection
+	PageCategories    []ContentCategory `json:"pagecat,omitempty"`       // Array of IAB content categories for page
+	PrivacyPolicy     *int              `json:"privacypolicy,omitempty"` // Default: 1 ("1": has a privacy policy)
+	Publisher         *Publisher        `json:"publisher,omitempty"`     // Details about the Publisher
+	Content           *Content          `json:"content,omitempty"`       // Details about the Content
+	Keywords          string            `json:"keywords,omitempty"`      // Comma separated list of keywords about the site.
+	Ext               json.RawMessage   `json:"ext,omitempty"`
 }
 
 // GetPrivacyPolicy returns the privacy policy value
@@ -24,23 +25,23 @@ func (a *Inventory) GetPrivacyPolicy() int {
 	return 1
 }
 
-// An "app" object should be included if the ad supported content is part of a mobile application
+// App object should be included if the ad supported content is part of a mobile application
 // (as opposed to a mobile website).  A bid request must not contain both an "app" object and a
 // "site" object.
 type App struct {
 	Inventory
 	Bundle   string `json:"bundle,omitempty"`   // App bundle or package name
 	StoreURL string `json:"storeurl,omitempty"` // App store URL for an installed app
-	Ver      string `json:"ver,omitempty"`      // App version
+	Version  string `json:"ver,omitempty"`      // App version
 	Paid     int    `json:"paid,omitempty"`     // "1": Paid, "2": Free
 }
 
-// A site object should be included if the ad supported content is part of a website (as opposed to
+// Site object should be included if the ad supported content is part of a website (as opposed to
 // an application).  A bid request must not contain both a site object and an app object.
 type Site struct {
 	Inventory
-	Page   string `json:"page,omitempty"`   // URL of the page
-	Ref    string `json:"ref,omitempty"`    // Referrer URL
-	Search string `json:"search,omitempty"` // Search string that caused naviation
-	Mobile int    `json:"mobile,omitempty"` // Mobile ("1": site is mobile optimised)
+	Page     string `json:"page,omitempty"`   // URL of the page
+	Referrer string `json:"ref,omitempty"`    // Referrer URL
+	Search   string `json:"search,omitempty"` // Search string that caused naviation
+	Mobile   int    `json:"mobile,omitempty"` // Mobile ("1": site is mobile optimised)
 }
diff --git a/inventory_test.go b/inventory_test.go
index 6bce843..ec3d867 100644
--- a/inventory_test.go
+++ b/inventory_test.go
@@ -9,8 +9,7 @@ var _ = Describe("App", func() {
 	var subject *App
 
 	BeforeEach(func() {
-		err := fixture("app", &subject)
-		Expect(err).NotTo(HaveOccurred())
+		Expect(fixture("app", &subject)).To(Succeed())
 	})
 
 	It("should have accessors", func() {
@@ -20,9 +19,9 @@ var _ = Describe("App", func() {
 	It("should parse correctly", func() {
 		Expect(subject).To(Equal(&App{
 			Inventory: Inventory{
-				ID:   "agltb3B1Yi1pbmNyDAsSA0FwcBiJkfIUDA",
-				Name: "Yahoo Weather",
-				Cat:  []string{"weather", "IAB15", "IAB15-10"},
+				ID:         "agltb3B1Yi1pbmNyDAsSA0FwcBiJkfIUDA",
+				Name:       "Yahoo Weather",
+				Categories: []ContentCategory{"weather", ContentCategoryScience, ContentCategoryWeather},
 				Publisher: &Publisher{
 					ID:     "agltb3B1Yi1pbmNyDAsSA0FwcBiJkfTUCV",
 					Name:   "yahoo",
@@ -30,19 +29,17 @@ var _ = Describe("App", func() {
 				},
 			},
 			Bundle:   "628677149",
-			Ver:      "1.0.2",
+			Version:  "1.0.2",
 			StoreURL: "https://itunes.apple.com/id628677149",
 		}))
 	})
-
 })
 
 var _ = Describe("Site", func() {
 	var subject *Site
 
 	BeforeEach(func() {
-		err := fixture("site", &subject)
-		Expect(err).NotTo(HaveOccurred())
+		Expect(fixture("site", &subject)).To(Succeed())
 	})
 
 	It("should have accessors", func() {
@@ -52,9 +49,9 @@ var _ = Describe("Site", func() {
 	It("should parse correctly", func() {
 		Expect(subject).To(Equal(&Site{
 			Inventory: Inventory{
-				ID:     "102855",
-				Cat:    []string{"IAB3-1"},
-				Domain: "http://www.usabarfinder.com",
+				ID:         "102855",
+				Categories: []ContentCategory{ContentCategoryAdvertising},
+				Domain:     "http://www.usabarfinder.com",
 				Publisher: &Publisher{
 					ID:     "8953",
 					Name:   "local.com",
@@ -64,5 +61,4 @@ var _ = Describe("Site", func() {
 			Page: "http://eas.usabarfinder.com/eas?cu=13824;cre=mu;target=_blank",
 		}))
 	})
-
 })
diff --git a/native.go b/native.go
index a05801d..5192ea7 100644
--- a/native.go
+++ b/native.go
@@ -2,7 +2,7 @@ package openrtb
 
 import "encoding/json"
 
-// This object represents a native type impression. Native ad units are intended to blend seamlessly into
+// Native object represents a native type impression. Native ad units are intended to blend seamlessly into
 // the surrounding content (e.g., a sponsored Twitter or Facebook post). As such, the response must be
 // well-structured to afford the publisher fine-grained control over rendering.
 // The presence of a Native as a subordinate of the Imp object indicates that this impression is offered as
@@ -10,9 +10,9 @@ import "encoding/json"
 // banner and/or video by also including as Imp subordinates the Banner and/or Video objects,
 // respectively. However, any given bid for the impression must conform to one of the offered types.
 type Native struct {
-	Request json.RawMessage `json:"request"`         // Request payload complying with the Native Ad Specification.
-	Ver     string          `json:"ver,omitempty"`   // Version of the Native Ad Specification to which request complies; highly recommended for efficient parsing.
-	API     []int           `json:"api,omitempty"`   // List of supported API frameworks for this impression.
-	BAttr   []int           `json:"battr,omitempty"` // Blocked creative attributes
-	Ext     json.RawMessage `json:"ext,omitempty"`
+	Request      json.RawMessage     `json:"request"`         // Request payload complying with the Native Ad Specification.
+	Version      string              `json:"ver,omitempty"`   // Version of the Native Ad Specification to which request complies; highly recommended for efficient parsing.
+	APIs         []APIFramework      `json:"api,omitempty"`   // List of supported API frameworks for this impression.
+	BlockedAttrs []CreativeAttribute `json:"battr,omitempty"` // Blocked creative attributes
+	Ext          json.RawMessage     `json:"ext,omitempty"`
 }
diff --git a/native/request/asset.go b/native/request/asset.go
index cc19e35..6d0df9e 100644
--- a/native/request/asset.go
+++ b/native/request/asset.go
@@ -2,7 +2,7 @@ package request
 
 import "encoding/json"
 
-// The main container object for each asset requested or supported by Exchange
+// Asset is the main container object for each asset requested or supported by Exchange
 // on behalf of the rendering client.  Only one of the {title,img,video,data}
 // objects should be present in each object.  The id is to be unique within the
 // AssetObject array so that the response can be aligned.
diff --git a/native/request/data.go b/native/request/data.go
index 8077eb4..33f8ea0 100644
--- a/native/request/data.go
+++ b/native/request/data.go
@@ -2,8 +2,10 @@ package request
 
 import "encoding/json"
 
+// DataTypeID enum.
 type DataTypeID int
 
+// DataTypeID enum values.
 const (
 	DataTypeSponsored      DataTypeID = 1  // Sponsored By message where response should contain the brand name of the sponsor
 	DataTypeDesc           DataTypeID = 2  // Descriptive text associated with the product or service being advertised
@@ -20,6 +22,7 @@ const (
 
 )
 
+// Data is the native data object.
 type Data struct {
 	TypeID DataTypeID      `json:"type"` // Type ID of the element supported by the publisher. The publisher can display this information in an appropriate format
 	Length int             `json:"len"`  // Maximum length of the text in the element’s response
diff --git a/native/request/image.go b/native/request/image.go
index e76a45d..1f83323 100644
--- a/native/request/image.go
+++ b/native/request/image.go
@@ -2,14 +2,17 @@ package request
 
 import "encoding/json"
 
+// ImageTypeID enum.
 type ImageTypeID int
 
+// ImageTypeID enum values.
 const (
 	ImageTypeIcon ImageTypeID = 1 // Icon image
 	ImageTypeLogo ImageTypeID = 2 // Logo image for the brand/app
 	ImageTypeMain ImageTypeID = 3 // Large image preview for the ad
 )
 
+// Image is the native image object.
 type Image struct {
 	TypeID ImageTypeID `json:"type,omitempty"` // Type ID of the image element supported by the publisher
 
@@ -19,6 +22,6 @@ type Image struct {
 	HeightMin int `json:"hmin,omitempty"` // The minimum requested height of the image in pixels
 	// Either h/w or hmin/wmin should be transmitted. If only h/w is included, it
 	// should be considered an exact requirement
-	Mimes []string        `json:"mimes,omitempty"` // Whitelist of content MIME types supported
+	MIMEs []string        `json:"mimes,omitempty"` // Whitelist of content MIME types supported
 	Ext   json.RawMessage `json:"ext,omitempty"`
 }
diff --git a/native/request/request.go b/native/request/request.go
index 3a469d3..c1dcad9 100644
--- a/native/request/request.go
+++ b/native/request/request.go
@@ -2,8 +2,10 @@ package request
 
 import "encoding/json"
 
+// LayoutID enum.
 type LayoutID int
 
+// LayoutID enum values.
 const (
 	LayoutContentWall          LayoutID = 1
 	LayoutAppWall              LayoutID = 2
@@ -14,8 +16,10 @@ const (
 	LayoutGridAdjoiningContent LayoutID = 7
 )
 
+// AdUnitID enum.
 type AdUnitID int
 
+// AdUnitID enum values.
 const (
 	AdUnitPaidSearch            AdUnitID = 1
 	AdUnitRecommendationWidget  AdUnitID = 2
@@ -24,33 +28,33 @@ const (
 	AdUnitCustom                AdUnitID = 5
 )
 
+// ContextTypeID enum.
 type ContextTypeID int
 
+// ContextTypeID enum values.
 const (
 	ContextTypeContent ContextTypeID = 1 // newsfeed, article, image gallery, video gallery
 	ContextTypeSocial  ContextTypeID = 2 // social network feed, email, chat
 	ContextTypeProduct ContextTypeID = 3 // product listings, details, recommendations, reviews
-)
-
-type ContextSubTypeID int
 
-const (
-	ContextSubTypeGeneral        ContextSubTypeID = 10
-	ContextSubTypeArticle        ContextSubTypeID = 11
-	ContextSubTypeVideo          ContextSubTypeID = 12
-	ContextSubTypeAudio          ContextSubTypeID = 13
-	ContextSubTypeImage          ContextSubTypeID = 14
-	ContextSubTypeUserGenerated  ContextSubTypeID = 15
-	ContextSubTypeSocial         ContextSubTypeID = 20
-	ContextSubTypeEmail          ContextSubTypeID = 21
-	ContextSubTypeChat           ContextSubTypeID = 22
-	ContextSubTypeSelling        ContextSubTypeID = 30
-	ContextSubTypeAppStore       ContextSubTypeID = 31
-	ContextSubTypeProductReviews ContextSubTypeID = 32
+	ContextSubTypeGeneral        ContextTypeID = 10
+	ContextSubTypeArticle        ContextTypeID = 11
+	ContextSubTypeVideo          ContextTypeID = 12
+	ContextSubTypeAudio          ContextTypeID = 13
+	ContextSubTypeImage          ContextTypeID = 14
+	ContextSubTypeUserGenerated  ContextTypeID = 15
+	ContextSubTypeSocial         ContextTypeID = 20
+	ContextSubTypeEmail          ContextTypeID = 21
+	ContextSubTypeChat           ContextTypeID = 22
+	ContextSubTypeSelling        ContextTypeID = 30
+	ContextSubTypeAppStore       ContextTypeID = 31
+	ContextSubTypeProductReviews ContextTypeID = 32
 )
 
+// PlacementTypeID enum.
 type PlacementTypeID int
 
+// PlacementTypeID enum values.
 const (
 	PlacementTypeInFeed         PlacementTypeID = 1 // In the feed of content - for example as an item inside the organic feed/grid/listing/carousel
 	PlacementTypeAtomic         PlacementTypeID = 2 // In the atomic unit of the content - IE in the article page or single image page
@@ -58,7 +62,7 @@ const (
 	PlacementTypeRecommendation PlacementTypeID = 4 // Recommendation widget, most commonly presented below the article content
 )
 
-// This object represents a native type impression. Native ad units are intended to blend seamlessly into
+// Request object represents a native type impression. Native ad units are intended to blend seamlessly into
 // the surrounding content (e.g., a sponsored Twitter or Facebook post). As such, the response must be
 // well-structured to afford the publisher fine-grained control over rendering.
 // The presence of a Native as a subordinate of the Imp object indicates that this impression is offered as
@@ -66,14 +70,14 @@ const (
 // banner and/or video by also including as Imp subordinates the Banner and/or Video objects,
 // respectively. However, any given bid for the impression must conform to one of the offered types.
 type Request struct {
-	Ver              string           `json:"ver,omitempty"`            // Version of the Native Markup
-	LayoutID         LayoutID         `json:"layout,omitempty"`         // DEPRECATED The Layout ID of the native ad
-	AdUnitID         AdUnitID         `json:"adunit,omitempty"`         // DEPRECATED The Ad unit ID of the native ad
-	ContextTypeID    ContextTypeID    `json:"context,omitempty"`        // The context in which the ad appears
-	ContextSubTypeID ContextSubTypeID `json:"contextsubtype,omitempty"` // A more detailed context in which the ad appears
-	PlacementTypeID  PlacementTypeID  `json:"plcmttype,omitempty"`      // The design/format/layout of the ad unit being offered
-	PlacementCount   int              `json:"plcmtcnt,omitempty"`       // The number of identical placements in this Layout
-	Sequence         int              `json:"seq,omitempty"`            // 0 for the first ad, 1 for the second ad, and so on
-	Assets           []Asset          `json:"assets"`                   // An array of Asset Objects
-	Ext              json.RawMessage  `json:"ext,omitempty"`
+	Version          string          `json:"ver,omitempty"`            // Version of the Native Markup
+	LayoutID         LayoutID        `json:"layout,omitempty"`         // DEPRECATED The Layout ID of the native ad
+	AdUnitID         AdUnitID        `json:"adunit,omitempty"`         // DEPRECATED The Ad unit ID of the native ad
+	ContextTypeID    ContextTypeID   `json:"context,omitempty"`        // The context in which the ad appears
+	ContextSubTypeID ContextTypeID   `json:"contextsubtype,omitempty"` // A more detailed context in which the ad appears
+	PlacementTypeID  PlacementTypeID `json:"plcmttype,omitempty"`      // The design/format/layout of the ad unit being offered
+	PlacementCount   int             `json:"plcmtcnt,omitempty"`       // The number of identical placements in this Layout
+	Sequence         int             `json:"seq,omitempty"`            // 0 for the first ad, 1 for the second ad, and so on
+	Assets           []Asset         `json:"assets"`                   // An array of Asset Objects
+	Ext              json.RawMessage `json:"ext,omitempty"`
 }
diff --git a/native/request/request_test.go b/native/request/request_test.go
index 0f84260..9c6091b 100644
--- a/native/request/request_test.go
+++ b/native/request/request_test.go
@@ -5,7 +5,7 @@ import (
 	"io/ioutil"
 	"testing"
 
-	"github.com/bsm/openrtb"
+	"github.com/bsm/openrtb/v3"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
@@ -14,7 +14,7 @@ var _ = Describe("Request", func() {
 	It("should parse correctly", func() {
 		req := fixture("testdata/request1.json")
 		Expect(req).To(Equal(&Request{
-			Ver:              "1.1",
+			Version:          "1.1",
 			ContextTypeID:    ContextTypeSocial,
 			ContextSubTypeID: ContextSubTypeSocial,
 			PlacementTypeID:  PlacementTypeID(11),
@@ -22,10 +22,10 @@ var _ = Describe("Request", func() {
 			Sequence:         2,
 			Assets: []Asset{
 				{ID: 123, Required: 1, Title: &Title{Length: 140}},
-				{ID: 128, Image: &Image{TypeID: ImageTypeMain, WidthMin: 836, HeightMin: 627, Width: 1000, Height: 800, Mimes: []string{"image/jpg"}}},
+				{ID: 128, Image: &Image{TypeID: ImageTypeMain, WidthMin: 836, HeightMin: 627, Width: 1000, Height: 800, MIMEs: []string{"image/jpg"}}},
 				{ID: 126, Required: 1, Data: &Data{TypeID: DataTypeSponsored, Length: 25}},
 				{ID: 127, Required: 1, Data: &Data{TypeID: DataTypeDesc, Length: 140}},
-				{ID: 4, Video: &Video{MinDuration: 15, MaxDuration: 30, Protocols: []int{openrtb.VideoProtoVAST2, openrtb.VideoProtoVAST3}, Mimes: []string{"video/mp4"}}},
+				{ID: 4, Video: &Video{MinDuration: 15, MaxDuration: 30, Protocols: []openrtb.Protocol{openrtb.ProtocolVAST2, openrtb.ProtocolVAST3}, MIMEs: []string{"video/mp4"}}},
 			},
 		}))
 	})
diff --git a/native/request/title.go b/native/request/title.go
index 7a5b394..a539af1 100644
--- a/native/request/title.go
+++ b/native/request/title.go
@@ -2,6 +2,7 @@ package request
 
 import "encoding/json"
 
+// Title is the native title object.
 type Title struct {
 	Length int             `json:"len"` // Maximum length of the text in the title element
 	Ext    json.RawMessage `json:"ext,omitempty"`
diff --git a/native/request/video.go b/native/request/video.go
index cf682fe..f9b3a4c 100644
--- a/native/request/video.go
+++ b/native/request/video.go
@@ -1,12 +1,16 @@
 package request
 
-import "encoding/json"
+import (
+	"encoding/json"
 
-// TODO unclear if its the same as imp.video https://github.com/openrtb/OpenRTB/issues/26
+	"github.com/bsm/openrtb/v3"
+)
+
+// Video is the native video object.
 type Video struct {
-	Mimes       []string        `json:"mimes,omitempty"`       // Whitelist of content MIME types supported
-	MinDuration int             `json:"minduration,omitempty"` // Minimum video ad duration in seconds
-	MaxDuration int             `json:"maxduration,omitempty"` // Maximum video ad duration in seconds
-	Protocols   []int           `json:"protocols,omitempty"`   // Video bid response protocols
-	Ext         json.RawMessage `json:"ext,omitempty"`
+	MIMEs       []string           `json:"mimes,omitempty"`       // Whitelist of content MIME types supported
+	MinDuration int                `json:"minduration,omitempty"` // Minimum video ad duration in seconds
+	MaxDuration int                `json:"maxduration,omitempty"` // Maximum video ad duration in seconds
+	Protocols   []openrtb.Protocol `json:"protocols,omitempty"`   // Video bid response protocols
+	Ext         json.RawMessage    `json:"ext,omitempty"`
 }
diff --git a/native/response/asset.go b/native/response/asset.go
index 84975a6..4f0c0ea 100644
--- a/native/response/asset.go
+++ b/native/response/asset.go
@@ -2,7 +2,7 @@ package response
 
 import "encoding/json"
 
-// Corresponds to the Asset Object in the request. The main container object for
+// Asset corresponds to the Asset Object in the request. The main container object for
 // each asset requested or supported by Exchange on behalf of the rendering
 // client. Any object that is required is to be flagged as such. Only one of the
 // {title,img,video,data} objects should be present in each object. All others
diff --git a/native/response/data.go b/native/response/data.go
index 4ff5318..20c9bd2 100644
--- a/native/response/data.go
+++ b/native/response/data.go
@@ -2,6 +2,7 @@ package response
 
 import "encoding/json"
 
+// Data object contains response data.
 type Data struct {
 	Label string          `json:"label,omitempty"` // The optional formatted string name of the data type to be displayed
 	Value string          `json:"value"`           // The formatted string of data to be displayed. Can contain a formatted value such as “5 stars” or “$10” or “3.4 stars out of 5”
diff --git a/native/response/image.go b/native/response/image.go
index a6aa401..de4b5b8 100644
--- a/native/response/image.go
+++ b/native/response/image.go
@@ -2,6 +2,7 @@ package response
 
 import "encoding/json"
 
+// Image object contains response image.
 type Image struct {
 	URL    string          `json:"url,omitempty"` // URL of the image asset
 	Width  int             `json:"w,omitempty"`   // Width of the image in pixels
diff --git a/native/response/link.go b/native/response/link.go
index 58bbff1..6743ed6 100644
--- a/native/response/link.go
+++ b/native/response/link.go
@@ -2,6 +2,7 @@ package response
 
 import "encoding/json"
 
+// Link object contains response link.
 type Link struct {
 	URL           string          `json:"url"`                     // Landing URL of the clickable link
 	ClickTrackers []string        `json:"clicktrackers,omitempty"` // List of third-party tracker URLs to be fired on click of the URL
diff --git a/native/response/response.go b/native/response/response.go
index 1963104..500464d 100644
--- a/native/response/response.go
+++ b/native/response/response.go
@@ -3,12 +3,12 @@ package response
 import (
 	"encoding/json"
 
-	"github.com/bsm/openrtb"
+	"github.com/bsm/openrtb/v3"
 )
 
-// The native object is the top level JSON object which identifies a native response
+// Response is the native object is the top level JSON object which identifies a native response.
 type Response struct {
-	Ver         openrtb.StringOrNumber `json:"ver,omitempty"`         // Version of the Native Markup
+	Version     openrtb.StringOrNumber `json:"ver,omitempty"`         // Version of the Native Markup
 	Assets      []Asset                `json:"assets"`                // An array of Asset Objects
 	Link        Link                   `json:"link"`                  // Destination Link. This is default link object for the ad
 	ImpTrackers []string               `json:"imptrackers,omitempty"` // Array of impression tracking URLs, expected to return a 1x1 image or 204 response
diff --git a/native/response/response_test.go b/native/response/response_test.go
index 0ba5cf0..52ad0b7 100644
--- a/native/response/response_test.go
+++ b/native/response/response_test.go
@@ -10,10 +10,9 @@ import (
 )
 
 var _ = Describe("Response", func() {
-
 	It("should parse correctly", func() {
-		Expect(fixture("testdata/response1.json")).To(Equal(Response{
-			Ver:         "1.1",
+		Expect(fixture("testdata/response1.json")).To(Equal(&Response{
+			Version:         "1.1",
 			ImpTrackers: []string{"http://imptracker.com"},
 			JSTracker:   "<script>track()</script>",
 			Link: Link{
@@ -30,7 +29,6 @@ var _ = Describe("Response", func() {
 			},
 		}))
 	})
-
 })
 
 func TestSuite(t *testing.T) {
@@ -38,10 +36,9 @@ func TestSuite(t *testing.T) {
 	RunSpecs(t, "openrtb/native/response")
 }
 
-func fixture(path string) Response {
-	var subject Response
+func fixture(path string) (res *Response) {
 	enc, err := ioutil.ReadFile(path)
 	Expect(err).ToNot(HaveOccurred())
-	Expect(json.Unmarshal(enc, &subject)).To(Succeed())
-	return subject
+	Expect(json.Unmarshal(enc, &res)).To(Succeed())
+	return res
 }
diff --git a/native/response/title.go b/native/response/title.go
index 52f9837..b0c71ac 100644
--- a/native/response/title.go
+++ b/native/response/title.go
@@ -2,6 +2,7 @@ package response
 
 import "encoding/json"
 
+// Title wraps title information.
 type Title struct {
 	Text string          `json:"text"` // The text associated with the text element
 	Ext  json.RawMessage `json:"ext,omitempty"`
diff --git a/native/response/video.go b/native/response/video.go
index 0209389..50ee6ad 100644
--- a/native/response/video.go
+++ b/native/response/video.go
@@ -1,5 +1,6 @@
 package response
 
+// Video is the VAST wrapper object.
 type Video struct {
 	VASTTag string `json:"vasttag"` // VAST XML
 }
diff --git a/native_test.go b/native_test.go
index 1abb9e0..d3b5d4e 100644
--- a/native_test.go
+++ b/native_test.go
@@ -11,15 +11,13 @@ var _ = Describe("Native", func() {
 	var subject *Native
 
 	BeforeEach(func() {
-		err := fixture("native", &subject)
-		Expect(err).NotTo(HaveOccurred())
+		Expect(fixture("native", &subject)).To(Succeed())
 	})
 
 	It("should parse correctly", func() {
 		Expect(subject).To(Equal(&Native{
 			Request: json.RawMessage(`"PAYLOAD"`),
-			Ver:     "2",
+			Version:     "2",
 		}))
 	})
-
 })
diff --git a/numbers_test.go b/numbers_test.go
index 007a031..7b237f5 100644
--- a/numbers_test.go
+++ b/numbers_test.go
@@ -8,7 +8,6 @@ import (
 )
 
 var _ = Describe("NumberOrString", func() {
-
 	It("should decode numbers", func() {
 		var n NumberOrString
 		Expect(json.Unmarshal([]byte(`33`), &n)).To(Succeed())
@@ -27,11 +26,9 @@ var _ = Describe("NumberOrString", func() {
 		Expect(err).NotTo(HaveOccurred())
 		Expect(string(bin)).To(Equal(`33`))
 	})
-
 })
 
 var _ = Describe("StringOrNumber", func() {
-
 	It("should decode numbers", func() {
 		var n StringOrNumber
 		Expect(json.Unmarshal([]byte(`33`), &n)).To(Succeed())
@@ -63,5 +60,4 @@ var _ = Describe("StringOrNumber", func() {
 		Expect(err).NotTo(HaveOccurred())
 		Expect(string(bin)).To(Equal(`""`))
 	})
-
 })
diff --git a/openrtb.go b/openrtb.go
index 311b344..0718173 100644
--- a/openrtb.go
+++ b/openrtb.go
@@ -2,189 +2,734 @@ package openrtb
 
 import "encoding/json"
 
+// ContentCategory as defined in section 5.1
+type ContentCategory string
+
+// ContentCategory values.
+const (
+	ContentCategoryArtsEntertainment  = "IAB1"
+	ContentCategoryBooksLiterature    = "IAB1-1"
+	ContentCategoryCelebrityFanGossip = "IAB1-2"
+	ContentCategoryFineArt            = "IAB1-3"
+	ContentCategoryHumor              = "IAB1-4"
+	ContentCategoryMovies             = "IAB1-5"
+	ContentCategoryMusic              = "IAB1-6"
+	ContentCategoryTelevision         = "IAB1-7"
+
+	ContentCategoryAutomotive          = "IAB2"
+	ContentCategoryAutoParts           = "IAB2-1"
+	ContentCategoryAutoRepair          = "IAB2-2"
+	ContentCategoryBuyingSellingCars   = "IAB2-3"
+	ContentCategoryCarCulture          = "IAB2-4"
+	ContentCategoryCertifiedPreOwned   = "IAB2-5"
+	ContentCategoryConvertible         = "IAB2-6"
+	ContentCategoryCoupe               = "IAB2-7"
+	ContentCategoryCrossover           = "IAB2-8"
+	ContentCategoryDiesel              = "IAB2-9"
+	ContentCategoryElectricVehicle     = "IAB2-10"
+	ContentCategoryHatchback           = "IAB2-11"
+	ContentCategoryHybrid              = "IAB2-12"
+	ContentCategoryLuxury              = "IAB2-13"
+	ContentCategoryMiniVan             = "IAB2-14"
+	ContentCategoryMororcycles         = "IAB2-15"
+	ContentCategoryOffRoadVehicles     = "IAB2-16"
+	ContentCategoryPerformanceVehicles = "IAB2-17"
+	ContentCategoryPickup              = "IAB2-18"
+	ContentCategoryRoadSideAssistance  = "IAB2-19"
+	ContentCategorySedan               = "IAB2-20"
+	ContentCategoryTrucksAccessories   = "IAB2-21"
+	ContentCategoryVintageCars         = "IAB2-22"
+	ContentCategoryWagon               = "IAB2-23"
+
+	ContentCategoryBusiness          = "IAB3"
+	ContentCategoryAdvertising       = "IAB3-1"
+	ContentCategoryAgriculture       = "IAB3-2"
+	ContentCategoryBiotechBiomedical = "IAB3-3"
+	ContentCategoryBusinessSoftware  = "IAB3-4"
+	ContentCategoryConstruction      = "IAB3-5"
+	ContentCategoryForestry          = "IAB3-6"
+	ContentCategoryGovernment        = "IAB3-7"
+	ContentCategoryGreenSolutions    = "IAB3-8"
+	ContentCategoryHumanResources    = "IAB3-9"
+	ContentCategoryLogistics         = "IAB3-10"
+	ContentCategoryMarketing         = "IAB3-11"
+	ContentCategoryMetals            = "IAB3-12"
+
+	ContentCategoryCareers             = "IAB4"
+	ContentCategoryCareerPlanning      = "IAB4-1"
+	ContentCategoryCollege             = "IAB4-2"
+	ContentCategoryFinancialAid        = "IAB4-3"
+	ContentCategoryJobFairs            = "IAB4-4"
+	ContentCategoryJobSearch           = "IAB4-5"
+	ContentCategoryResumeWritingAdvice = "IAB4-6"
+	ContentCategoryNursing             = "IAB4-7"
+	ContentCategoryScholarships        = "IAB4-8"
+	ContentCategoryTelecommuting       = "IAB4-9"
+	ContentCategoryUSMilitary          = "IAB4-10"
+	ContentCategoryCareerAdvice        = "IAB4-11"
+
+	ContentCategoryEducation             = "IAB5"
+	ContentCategory12Education           = "IAB5-17"
+	ContentCategoryAdultEducation        = "IAB5-2"
+	ContentCategoryArtHistory            = "IAB5-3"
+	ContentCategoryCollegeAdministration = "IAB5-4"
+	ContentCategoryCollegeLife           = "IAB5-5"
+	ContentCategoryDistanceLearning      = "IAB5-6"
+	ContentCategoryEnglishasa2ndLanguage = "IAB5-7"
+	ContentCategoryLanguageLearning      = "IAB5-8"
+	ContentCategoryGraduateSchool        = "IAB5-9"
+	ContentCategoryHomeschooling         = "IAB5-10"
+	ContentCategoryHomeworkStudyTips     = "IAB5-11"
+	ContentCategoryK6Educators           = "IAB5-12"
+	ContentCategoryPrivateSchool         = "IAB5-13"
+	ContentCategorySpecialEducation      = "IAB5-14"
+	ContentCategoryStudyingBusiness      = "IAB5-15"
+
+	ContentCategoryFamilyParenting  = "IAB6"
+	ContentCategoryAdoption         = "IAB6-1"
+	ContentCategoryBabiesToddlers   = "IAB6-2"
+	ContentCategoryDaycarePreSchool = "IAB6-3"
+	ContentCategoryFamilyInternet   = "IAB6-4"
+	ContentCategoryParentingK6Kids  = "IAB6-5"
+	ContentCategoryParentingteens   = "IAB6-6"
+	ContentCategoryPregnancy        = "IAB6-7"
+	ContentCategorySpecialNeedsKids = "IAB6-8"
+	ContentCategoryEldercare        = "IAB6-9"
+
+	ContentCategoryHealthFitness          = "IAB7"
+	ContentCategoryExercise               = "IAB7-1"
+	ContentCategoryADD                    = "IAB7-2"
+	ContentCategoryAIDSHIV                = "IAB7-3"
+	ContentCategoryAllergies              = "IAB7-4"
+	ContentCategoryAlternativeMedicine    = "IAB7-5"
+	ContentCategoryArthritis              = "IAB7-6"
+	ContentCategoryAsthma                 = "IAB7-7"
+	ContentCategoryAutismPDD              = "IAB7-8"
+	ContentCategoryBipolarDisorder        = "IAB7-9"
+	ContentCategoryBrainTumor             = "IAB7-10"
+	ContentCategoryCancer                 = "IAB7-11"
+	ContentCategoryCholesterol            = "IAB7-12"
+	ContentCategoryChronicFatigueSyndrome = "IAB7-13"
+	ContentCategoryChronicPain            = "IAB7-14"
+	ContentCategoryColdFlu                = "IAB7-15"
+	ContentCategoryDeafness               = "IAB7-16"
+	ContentCategoryDentalCare             = "IAB7-17"
+	ContentCategoryDepression             = "IAB7-18"
+	ContentCategoryDermatology            = "IAB7-19"
+	ContentCategoryDiabetes               = "IAB7-20"
+	ContentCategoryEpilepsy               = "IAB7-21"
+	ContentCategoryGERDAcidReflux         = "IAB7-22"
+	ContentCategoryHeadachesMigraines     = "IAB7-23"
+	ContentCategoryHeartDisease           = "IAB7-24"
+	ContentCategoryHerbsforHealth         = "IAB7-25"
+	ContentCategoryHolisticHealing        = "IAB7-26"
+	ContentCategoryIBSCrohnsDisease       = "IAB7-27"
+	ContentCategoryIncestAbuseSupport     = "IAB7-28"
+	ContentCategoryIncontinence           = "IAB7-29"
+	ContentCategoryInfertility            = "IAB7-30"
+	ContentCategoryMensHealth             = "IAB7-31"
+	ContentCategoryNutrition              = "IAB7-32"
+	ContentCategoryOrthopedics            = "IAB7-33"
+	ContentCategoryPanicAnxietyDisorders  = "IAB7-34"
+	ContentCategoryPediatrics             = "IAB7-35"
+	ContentCategoryPhysicalTherapy        = "IAB7-36"
+	ContentCategoryPsychologyPsychiatry   = "IAB7-37"
+	ContentCategorySeniorHealth           = "IAB7-38"
+	ContentCategorySexuality              = "IAB7-39"
+	ContentCategorySleepDisorders         = "IAB7-40"
+	ContentCategorySmokingCessation       = "IAB7-41"
+	ContentCategorySubstanceAbuse         = "IAB7-42"
+	ContentCategoryThyroidDisease         = "IAB7-43"
+	ContentCategoryWeightLoss             = "IAB7-44"
+	ContentCategoryWomensHealth           = "IAB7-45"
+
+	ContentCategoryFoodDrink           = "IAB8"
+	ContentCategoryAmericanCuisine     = "IAB8-1"
+	ContentCategoryBarbecuesGrilling   = "IAB8-2"
+	ContentCategoryCajunCreole         = "IAB8-3"
+	ContentCategoryChineseCuisine      = "IAB8-4"
+	ContentCategoryCocktailsBeer       = "IAB8-5"
+	ContentCategoryCoffeeTea           = "IAB8-6"
+	ContentCategoryCuisineSpecific     = "IAB8-7"
+	ContentCategoryDessertsBaking      = "IAB8-8"
+	ContentCategoryDiningOut           = "IAB8-9"
+	ContentCategoryFoodAllergies       = "IAB8-10"
+	ContentCategoryFrenchCuisine       = "IAB8-11"
+	ContentCategoryHealthLowfatCooking = "IAB8-12"
+	ContentCategoryItalianCuisine      = "IAB8-13"
+	ContentCategoryJapaneseCuisine     = "IAB8-14"
+	ContentCategoryMexicanCuisine      = "IAB8-15"
+	ContentCategoryVegan               = "IAB8-16"
+	ContentCategoryVegetarian          = "IAB8-17"
+	ContentCategoryWine                = "IAB8-18"
+
+	ContentCategoryHobbiesInterests   = "IAB9"
+	ContentCategoryArtTechnology      = "IAB9-1"
+	ContentCategoryArtsCrafts         = "IAB9-2"
+	ContentCategoryBeadwork           = "IAB9-3"
+	ContentCategoryBirdwatching       = "IAB9-4"
+	ContentCategoryBoardGamesPuzzles  = "IAB9-5"
+	ContentCategoryCandleSoapMaking   = "IAB9-6"
+	ContentCategoryCardGames          = "IAB9-7"
+	ContentCategoryChess              = "IAB9-8"
+	ContentCategoryCigars             = "IAB9-9"
+	ContentCategoryCollecting         = "IAB9-10"
+	ContentCategoryComicBooks         = "IAB9-11"
+	ContentCategoryDrawingSketching   = "IAB9-12"
+	ContentCategoryFreelanceWriting   = "IAB9-13"
+	ContentCategoryGenealogy          = "IAB9-14"
+	ContentCategoryGettingPublished   = "IAB9-15"
+	ContentCategoryGuitar             = "IAB9-16"
+	ContentCategoryHomeRecording      = "IAB9-17"
+	ContentCategoryInvestorsPatents   = "IAB9-18"
+	ContentCategoryJewelryMaking      = "IAB9-19"
+	ContentCategoryMagicIllusion      = "IAB9-20"
+	ContentCategoryNeedlework         = "IAB9-21"
+	ContentCategoryPainting           = "IAB9-22"
+	ContentCategoryPhotography        = "IAB9-23"
+	ContentCategoryRadio              = "IAB9-24"
+	ContentCategoryRoleplayingGames   = "IAB9-25"
+	ContentCategorySciFiFantasy       = "IAB9-26"
+	ContentCategoryScrapbooking       = "IAB9-27"
+	ContentCategoryScreenwriting      = "IAB9-28"
+	ContentCategoryStampsCoins        = "IAB9-29"
+	ContentCategoryVideoComputerGames = "IAB9-30"
+	ContentCategoryWoodworking        = "IAB9-31"
+
+	ContentCategoryHomeGarden             = "IAB10"
+	ContentCategoryAppliances             = "IAB10-1"
+	ContentCategoryEntertaining           = "IAB10-2"
+	ContentCategoryEnvironmentalSafety    = "IAB10-3"
+	ContentCategoryGardening              = "IAB10-4"
+	ContentCategoryHomeRepair             = "IAB10-5"
+	ContentCategoryHomeTheater            = "IAB10-6"
+	ContentCategoryInteriorDecorating     = "IAB10-7"
+	ContentCategoryLandscaping            = "IAB10-8"
+	ContentCategoryRemodelingConstruction = "IAB10-9"
+
+	ContentCategoryLawGovtPolitics       = "IAB11"
+	ContentCategoryImmigration           = "IAB11-1"
+	ContentCategoryLegalIssues           = "IAB11-2"
+	ContentCategoryUSGovernmentResources = "IAB11-3"
+	ContentCategoryPolitics              = "IAB11-4"
+	ContentCategoryCommentary            = "IAB11-5"
+
+	ContentCategoryNews              = "IAB12"
+	ContentCategoryInternationalNews = "IAB12-1"
+	ContentCategoryNationalNews      = "IAB12-2"
+	ContentCategoryLocalNews         = "IAB12-3"
+
+	ContentCategoryPersonalFinance    = "IAB13"
+	ContentCategoryBeginningInvesting = "IAB13-1"
+	ContentCategoryCreditDebtLoans    = "IAB13-2"
+	ContentCategoryFinancialNews      = "IAB13-3"
+	ContentCategoryFinancialPlanning  = "IAB13-4"
+	ContentCategoryHedgeFund          = "IAB13-5"
+	ContentCategoryInsurance          = "IAB13-6"
+	ContentCategoryInvesting          = "IAB13-7"
+	ContentCategoryMutualFunds        = "IAB13-8"
+	ContentCategoryOptions            = "IAB13-9"
+	ContentCategoryRetirementPlanning = "IAB13-10"
+	ContentCategoryStocks             = "IAB13-11"
+	ContentCategoryTaxPlanning        = "IAB13-12"
+
+	ContentCategorySociety        = "IAB14"
+	ContentCategoryDating         = "IAB14-1"
+	ContentCategoryDivorceSupport = "IAB14-2"
+	ContentCategoryGayLife        = "IAB14-3"
+	ContentCategoryMarriage       = "IAB14-4"
+	ContentCategorySeniorLiving   = "IAB14-5"
+	ContentCategoryTeens          = "IAB14-6"
+	ContentCategoryWeddings       = "IAB14-7"
+	ContentCategoryEthnicSpecific = "IAB14-8"
+
+	ContentCategoryScience             = "IAB15"
+	ContentCategoryAstrology           = "IAB15-1"
+	ContentCategoryBiology             = "IAB15-2"
+	ContentCategoryChemistry           = "IAB15-3"
+	ContentCategoryGeology             = "IAB15-4"
+	ContentCategoryParanormalPhenomena = "IAB15-5"
+	ContentCategoryPhysics             = "IAB15-6"
+	ContentCategorySpaceAstronomy      = "IAB15-7"
+	ContentCategoryGeography           = "IAB15-8"
+	ContentCategoryBotany              = "IAB15-9"
+	ContentCategoryWeather             = "IAB15-10"
+
+	ContentCategoryPets               = "IAB16"
+	ContentCategoryAquariums          = "IAB16-1"
+	ContentCategoryBirds              = "IAB16-2"
+	ContentCategoryCats               = "IAB16-3"
+	ContentCategoryDogs               = "IAB16-4"
+	ContentCategoryLargeAnimals       = "IAB16-5"
+	ContentCategoryReptiles           = "IAB16-6"
+	ContentCategoryVeterinaryMedicine = "IAB16-7"
+
+	ContentCategorySports              = "IAB17"
+	ContentCategoryAutoRacing          = "IAB17-1"
+	ContentCategoryBaseball            = "IAB17-2"
+	ContentCategoryBicycling           = "IAB17-3"
+	ContentCategoryBodybuilding        = "IAB17-4"
+	ContentCategoryBoxing              = "IAB17-5"
+	ContentCategoryCanoeingKayaking    = "IAB17-6"
+	ContentCategoryCheerleading        = "IAB17-7"
+	ContentCategoryClimbing            = "IAB17-8"
+	ContentCategoryCricket             = "IAB17-9"
+	ContentCategoryFigureSkating       = "IAB17-10"
+	ContentCategoryFlyFishing          = "IAB17-11"
+	ContentCategoryFootball            = "IAB17-12"
+	ContentCategoryFreshwaterFishing   = "IAB17-13"
+	ContentCategoryGameFish            = "IAB17-14"
+	ContentCategoryGolf                = "IAB17-15"
+	ContentCategoryHorseRacing         = "IAB17-16"
+	ContentCategoryHorses              = "IAB17-17"
+	ContentCategoryHuntingShooting     = "IAB17-18"
+	ContentCategoryInlineSkating       = "IAB17-19"
+	ContentCategoryMartialArts         = "IAB17-20"
+	ContentCategoryMountainBiking      = "IAB17-21"
+	ContentCategoryNASCARRacing        = "IAB17-22"
+	ContentCategoryOlympics            = "IAB17-23"
+	ContentCategoryPaintball           = "IAB17-24"
+	ContentCategoryPowerMotorcycles    = "IAB17-25"
+	ContentCategoryProBasketball       = "IAB17-26"
+	ContentCategoryProIceHockey        = "IAB17-27"
+	ContentCategoryRodeo               = "IAB17-28"
+	ContentCategoryRugby               = "IAB17-29"
+	ContentCategoryRunningJogging      = "IAB17-30"
+	ContentCategorySailing             = "IAB17-31"
+	ContentCategorySaltwaterFishing    = "IAB17-32"
+	ContentCategoryScubaDiving         = "IAB17-33"
+	ContentCategorySkateboarding       = "IAB17-34"
+	ContentCategorySkiing              = "IAB17-35"
+	ContentCategorySnowboarding        = "IAB17-36"
+	ContentCategorySurfingBodyboarding = "IAB17-37"
+	ContentCategorySwimming            = "IAB17-38"
+	ContentCategoryTableTennisPingPong = "IAB17-39"
+	ContentCategoryTennis              = "IAB17-40"
+	ContentCategoryVolleyball          = "IAB17-41"
+	ContentCategoryWalking             = "IAB17-42"
+	ContentCategoryWaterskiWakeboard   = "IAB17-43"
+	ContentCategoryWorldSoccer         = "IAB17-44"
+
+	ContentCategoryStyleFashion = "IAB18"
+	ContentCategoryBeauty       = "IAB18-1"
+	ContentCategoryBodyArt      = "IAB18-2"
+	ContentCategoryFashion      = "IAB18-3"
+	ContentCategoryJewelry      = "IAB18-4"
+	ContentCategoryClothing     = "IAB18-5"
+	ContentCategoryAccessories  = "IAB18-6"
+
+	ContentCategoryTechnologyComputing   = "IAB19"
+	ContentCategoryDGraphics             = "IAB19-13"
+	ContentCategoryAnimation             = "IAB19-2"
+	ContentCategoryAntivirusSoftware     = "IAB19-3"
+	ContentCategoryCC                    = "IAB19-4"
+	ContentCategoryCamerasCamcorders     = "IAB19-5"
+	ContentCategoryCellPhones            = "IAB19-6"
+	ContentCategoryComputerCertification = "IAB19-7"
+	ContentCategoryComputerNetworking    = "IAB19-8"
+	ContentCategoryComputerPeripherals   = "IAB19-9"
+	ContentCategoryComputerReviews       = "IAB19-10"
+	ContentCategoryDataCenters           = "IAB19-11"
+	ContentCategoryDatabases             = "IAB19-12"
+	ContentCategoryDesktopPublishing     = "IAB19-13"
+	ContentCategoryDesktopVideo          = "IAB19-14"
+	ContentCategoryEmail                 = "IAB19-15"
+	ContentCategoryGraphicsSoftware      = "IAB19-16"
+	ContentCategoryHomeVideoDVD          = "IAB19-17"
+	ContentCategoryInternetTechnology    = "IAB19-18"
+	ContentCategoryJava                  = "IAB19-19"
+	ContentCategoryJavaScript            = "IAB19-20"
+	ContentCategoryMacSupport            = "IAB19-21"
+	ContentCategoryMP3MIDI               = "IAB19-22"
+	ContentCategoryNetConferencing       = "IAB19-23"
+	ContentCategoryNetforBeginners       = "IAB19-24"
+	ContentCategoryNetworkSecurity       = "IAB19-25"
+	ContentCategoryPalmtopsPDAs          = "IAB19-26"
+	ContentCategoryPCSupport             = "IAB19-27"
+	ContentCategoryPortable              = "IAB19-28"
+	ContentCategoryEntertainment         = "IAB19-29"
+	ContentCategorySharewareFreeware     = "IAB19-30"
+	ContentCategoryUnix                  = "IAB19-31"
+	ContentCategoryVisualBasic           = "IAB19-32"
+	ContentCategoryWebClipArt            = "IAB19-33"
+	ContentCategoryWebDesignHTML         = "IAB19-34"
+	ContentCategoryWebSearch             = "IAB19-35"
+	ContentCategoryWindows               = "IAB19-36"
+
+	ContentCategoryTravel               = "IAB20"
+	ContentCategoryAdventureTravel      = "IAB20-1"
+	ContentCategoryAfrica               = "IAB20-2"
+	ContentCategoryAirTravel            = "IAB20-3"
+	ContentCategoryAustraliaNewZealand  = "IAB20-4"
+	ContentCategoryBedBreakfasts        = "IAB20-5"
+	ContentCategoryBudgetTravel         = "IAB20-6"
+	ContentCategoryBusinessTravel       = "IAB20-7"
+	ContentCategoryByUSLocale           = "IAB20-8"
+	ContentCategoryCamping              = "IAB20-9"
+	ContentCategoryCanada               = "IAB20-10"
+	ContentCategoryCaribbean            = "IAB20-11"
+	ContentCategoryCruises              = "IAB20-12"
+	ContentCategoryEasternEurope        = "IAB20-13"
+	ContentCategoryEurope               = "IAB20-14"
+	ContentCategoryFrance               = "IAB20-15"
+	ContentCategoryGreece               = "IAB20-16"
+	ContentCategoryHoneymoonsGetaways   = "IAB20-17"
+	ContentCategoryHotels               = "IAB20-18"
+	ContentCategoryItaly                = "IAB20-19"
+	ContentCategoryJapan                = "IAB20-20"
+	ContentCategoryMexicoCentralAmerica = "IAB20-21"
+	ContentCategoryNationalParks        = "IAB20-22"
+	ContentCategorySouthAmerica         = "IAB20-23"
+	ContentCategorySpas                 = "IAB20-24"
+	ContentCategoryThemeParks           = "IAB20-25"
+	ContentCategoryTravelingwithKids    = "IAB20-26"
+	ContentCategoryUnitedKingdom        = "IAB20-27"
+
+	ContentCategoryRealEstate         = "IAB21"
+	ContentCategoryApartments         = "IAB21-1"
+	ContentCategoryArchitects         = "IAB21-2"
+	ContentCategoryBuyingSellingHomes = "IAB21-3"
+
+	ContentCategoryShopping         = "IAB22"
+	ContentCategoryContestsFreebies = "IAB22-1"
+	ContentCategoryCouponing        = "IAB22-2"
+	ContentCategoryComparison       = "IAB22-3"
+	ContentCategoryEngines          = "IAB22-4"
+
+	ContentCategoryReligionSpirituality = "IAB23"
+	ContentCategoryAlternativeReligions = "IAB23-1"
+	ContentCategoryAtheismAgnosticism   = "IAB23-2"
+	ContentCategoryBuddhism             = "IAB23-3"
+	ContentCategoryCatholicism          = "IAB23-4"
+	ContentCategoryChristianity         = "IAB23-5"
+	ContentCategoryHinduism             = "IAB23-6"
+	ContentCategoryIslam                = "IAB23-7"
+	ContentCategoryJudaism              = "IAB23-8"
+	ContentCategoryLatterDaySaints      = "IAB23-9"
+	ContentCategoryPaganWiccan          = "IAB23-10"
+
+	ContentCategoryUncategorized = "IAB24"
+
+	ContentCategoryNonStandardContent             = "IAB25"
+	ContentCategoryUnmoderatedUGC                 = "IAB25-1"
+	ContentCategoryExtremeGraphicExplicitViolence = "IAB25-2"
+	ContentCategoryPornography                    = "IAB25-3"
+	ContentCategoryProfaneContent                 = "IAB25-4"
+	ContentCategoryHateContent                    = "IAB25-5"
+	ContentCategoryUnderConstruction              = "IAB25-6"
+	ContentCategoryIncentivized                   = "IAB25-7"
+
+	ContentCategoryAnyIllegalContent     = "IAB26"
+	ContentCategoryIllegalContent        = "IAB26-1"
+	ContentCategoryWarez                 = "IAB26-2"
+	ContentCategorySpywareMalware        = "IAB26-3"
+	ContentCategoryCopyrightInfringement = "IAB26-4"
+)
+
+// BannerType as defined in section 5.2.
+type BannerType int
+
 // 5.2 Banner Ad Types
 const (
-	BannerTypeXHTMLText = 1
-	BannerTypeXHTML     = 2
-	BannerTypeJS        = 3
-	BannerTypeFrame     = 4
+	BannerTypeXHTMLText BannerType = 1
+	BannerTypeXHTML     BannerType = 2
+	BannerTypeJS        BannerType = 3
+	BannerTypeFrame     BannerType = 4
 )
 
+// CreativeAttribute as defined in section 5.3.
+type CreativeAttribute int
+
 // 5.3 Creative Attributes
 const (
-	CreativeAttributeAudioAdAutoPlay                 = 1
-	CreativeAttributeAudioAdUserInitiated            = 2
-	CreativeAttributeExpandableAuto                  = 3
-	CreativeAttributeExpandableUserInitiatedClick    = 4
-	CreativeAttributeExpandableUserInitiatedRollover = 5
-	CreativeAttributeInBannerVideoAdAutoPlay         = 6
-	CreativeAttributeInBannerVideoAdUserInitiated    = 7
-	CreativeAttributePop                             = 8
-	CreativeAttributeProvocativeOrSuggestiveImagery  = 9
-	CreativeAttributeExtremeAnimation                = 10
-	CreativeAttributeSurveys                         = 11
-	CreativeAttributeTextOnly                        = 12
-	CreativeAttributeUserInitiated                   = 13
-	CreativeAttributeWindowsDialogOrAlert            = 14
-	CreativeAttributeHasAudioWithPlayer              = 15
-	CreativeAttributeAdProvidesSkipButton            = 16
-	CreativeAttributeAdobeFlash                      = 17
+	CreativeAttributeAudioAdAutoPlay                 CreativeAttribute = 1
+	CreativeAttributeAudioAdUserInitiated            CreativeAttribute = 2
+	CreativeAttributeExpandableAuto                  CreativeAttribute = 3
+	CreativeAttributeExpandableUserInitiatedClick    CreativeAttribute = 4
+	CreativeAttributeExpandableUserInitiatedRollover CreativeAttribute = 5
+	CreativeAttributeInBannerVideoAdAutoPlay         CreativeAttribute = 6
+	CreativeAttributeInBannerVideoAdUserInitiated    CreativeAttribute = 7
+	CreativeAttributePop                             CreativeAttribute = 8
+	CreativeAttributeProvocativeOrSuggestiveImagery  CreativeAttribute = 9
+	CreativeAttributeExtremeAnimation                CreativeAttribute = 10
+	CreativeAttributeSurveys                         CreativeAttribute = 11
+	CreativeAttributeTextOnly                        CreativeAttribute = 12
+	CreativeAttributeUserInitiated                   CreativeAttribute = 13
+	CreativeAttributeWindowsDialogOrAlert            CreativeAttribute = 14
+	CreativeAttributeHasAudioWithPlayer              CreativeAttribute = 15
+	CreativeAttributeAdProvidesSkipButton            CreativeAttribute = 16
+	CreativeAttributeAdobeFlash                      CreativeAttribute = 17
 )
 
+// AdPosition as defined in section 5.4.
+type AdPosition int
+
 // 5.4 Ad Position
 const (
-	AdPosUnknown    = 0
-	AdPosAboveFold  = 1
-	AdPosBelowFold  = 3
-	AdPosHeader     = 4
-	AdPosFooter     = 5
-	AdPosSidebar    = 6
-	AdPosFullscreen = 7
+	AdPositionUnknown    AdPosition = 0
+	AdPositionAboveFold  AdPosition = 1
+	AdPositionBelowFold  AdPosition = 3
+	AdPositionHeader     AdPosition = 4
+	AdPositionFooter     AdPosition = 5
+	AdPositionSidebar    AdPosition = 6
+	AdPositionFullscreen AdPosition = 7
 )
 
+// ExpDir as defined in section 5.5.
+type ExpDir int
+
 // 5.5 Expandable Direction
 const (
-	ExpDirLeft       = 1
-	ExpDirRight      = 2
-	ExpDirUp         = 3
-	ExpDirDown       = 4
-	ExpDirFullScreen = 5
+	ExpDirUnknown    ExpDir = 0
+	ExpDirLeft       ExpDir = 1
+	ExpDirRight      ExpDir = 2
+	ExpDirUp         ExpDir = 3
+	ExpDirDown       ExpDir = 4
+	ExpDirFullScreen ExpDir = 5
 )
 
+// APIFramework as defined in section 5.6.
+type APIFramework int
+
 // 5.6 API Frameworks
 const (
-	APIFrameworkVPAID1 = 1
-	APIFrameworkVPAID2 = 2
-	APIFrameworkMRAID1 = 3
-	APIFrameworkORMMA  = 4
-	APIFrameworkMRAID2 = 5
+	APIFrameworkUnknown APIFramework = 0
+	APIFrameworkVPAID1  APIFramework = 1
+	APIFrameworkVPAID2  APIFramework = 2
+	APIFrameworkMRAID1  APIFramework = 3
+	APIFrameworkORMMA   APIFramework = 4
+	APIFrameworkMRAID2  APIFramework = 5
 )
 
+// VideoLinearity as defined in section 5.7.
+type VideoLinearity int
+
 // 5.7 Video Linearity
 const (
-	VideoLinearityLinear    = 1
-	VideoLinearityNonLinear = 2
+	VideoLinearityUnknown   VideoLinearity = 0
+	VideoLinearityLinear    VideoLinearity = 1
+	VideoLinearityNonLinear VideoLinearity = 2
 )
 
+// Protocol as defined in section 5.8.
+type Protocol int
+
 // 5.8 Video and Audio Bid Response Protocols
 const (
-	VideoProtoVAST1            = 1
-	VideoProtoVAST2            = 2
-	VideoProtoVAST3            = 3
-	VideoProtoVAST1Wrapper     = 4
-	VideoProtoVAST2Wrapper     = 5
-	VideoProtoVAST3Wrapper     = 6
-	VideoProtoVAST4            = 7
-	VideoProtoVAST4Wrapper     = 8
-	AudioProtocolDAAST1        = 9
-	AudioProtocolDAAST1Wrapper = 10
+	ProtocolUnknown       Protocol = 0
+	ProtocolVAST1         Protocol = 1
+	ProtocolVAST2         Protocol = 2
+	ProtocolVAST3         Protocol = 3
+	ProtocolVAST1Wrapper  Protocol = 4
+	ProtocolVAST2Wrapper  Protocol = 5
+	ProtocolVAST3Wrapper  Protocol = 6
+	ProtocolVAST4         Protocol = 7
+	ProtocolVAST4Wrapper  Protocol = 8
+	ProtocolDAAST1        Protocol = 9
+	ProtocolDAAST1Wrapper Protocol = 10
 )
 
-// 5.9 Video Playback Methods
+// VideoPlacement as defined in section 5.9.
+type VideoPlacement int
+
+// Video Placement Types
 const (
-	VideoPlaybackAutoSoundOn  = 1
-	VideoPlaybackAutoSoundOff = 2
-	VideoPlaybackClickToPlay  = 3
-	VideoPlaybackMouseOver    = 4
+	VideoPlacementUnknown      VideoPlacement = 0
+	VideoPlacementInStream     VideoPlacement = 1
+	VideoPlacementInBanner     VideoPlacement = 2
+	VideoPlacementInArticle    VideoPlacement = 3
+	VideoPlacementInFeed       VideoPlacement = 4
+	VideoPlacementInterstitial VideoPlacement = 5
 )
 
-// 5.9 Video Placement Types (Spec 2.5)
+// VideoPlayback as defined in section 5.10.
+type VideoPlayback int
+
+// 5.10 Video Playback Methods
 const (
-	VideoPlacementInStream     = 1
-	VideoPlacementInBanner     = 2
-	VideoPlacementInArticle    = 3
-	VideoPlacementInFeed       = 4
-	VideoPlacementInterstitial = 5
+	VideoPlaybackUnknown          VideoPlayback = 0
+	VideoPlaybackPageLoadSoundOn  VideoPlayback = 1
+	VideoPlaybackPageLoadSoundOff VideoPlayback = 2
+	VideoPlaybackClickToPlay      VideoPlayback = 3
+	VideoPlaybackMouseOver        VideoPlayback = 4
+	VideoPlaybackEnterSoundOn     VideoPlayback = 5
+	VideoPlaybackEnterSoundOff    VideoPlayback = 6
 )
 
-// 5.10 Video Start Delay
+// StartDelay as defined in section 5.12.
+type StartDelay int
+
+// 5.12 Video Start Delay
 const (
-	VideoStartDelayPreRoll         = 0
-	VideoStartDelayGenericMidRoll  = -1
-	VideoStartDelayGenericPostRoll = -2
+	StartDelayPreRoll         StartDelay = 0
+	StartDelayGenericMidRoll  StartDelay = -1
+	StartDelayGenericPostRoll StartDelay = -2
 )
 
-// 5.11 Video Quality
+// ProductionQuality as defined in section 5.13.
+type ProductionQuality int
+
+// 5.13 Video Quality
 const (
-	VideoQualityUnknown      = 0
-	VideoQualityProfessional = 1
-	VideoQualityProsumer     = 2
-	VideoQualityUGC          = 3
+	ProductionQualityUnknown      ProductionQuality = 0
+	ProductionQualityProfessional ProductionQuality = 1
+	ProductionQualityProsumer     ProductionQuality = 2
+	ProductionQualityUGC          ProductionQuality = 3
 )
 
-// 5.12 VAST Companion Types
+// CompanionType as defined in section 5.14.
+type CompanionType int
+
+// 5.14  Companion Types
 const (
-	VASTCompanionStatic = 1
-	VASTCompanionHTML   = 2
-	VASTCompanionIFrame = 3
+	CompanionTypeUnknown CompanionType = 0
+	CompanionTypeStatic  CompanionType = 1
+	CompanionTypeHTML    CompanionType = 2
+	CompanionTypeIFrame  CompanionType = 3
 )
 
-// 5.13 Content Delivery Methods
+// ContentDelivery as defined in section 5.15.
+type ContentDelivery int
+
+// 5.15 Content Delivery Methods
 const (
-	ContentDeliveryStreaming   = 1
-	ContentDeliveryProgressive = 2
-	ContentDeliveryDownload    = 3
+	ContentDeliveryUnknown     ContentDelivery = 0
+	ContentDeliveryStreaming   ContentDelivery = 1
+	ContentDeliveryProgressive ContentDelivery = 2
+	ContentDeliveryDownload    ContentDelivery = 3
 )
 
-// 5.14 Content Context
+// FeedType as defined in section 5.16.
+type FeedType int
+
+// 5.16 Feed Types
 const (
-	ContextVideo       = 1
-	ContextGame        = 2
-	ContextMusic       = 3
-	ContextApplication = 4
-	ContextText        = 5
-	ContextOther       = 6
-	ContextUnknown     = 7
+	FeedTypeUnknown   FeedType = 0
+	FeedTypeMusic     FeedType = 1
+	FeedTypeBroadcast FeedType = 2
+	FeedTypePodcast   FeedType = 3
 )
 
-// 5.15 QAG Media Ratings
+// VolumeNorm as defined in section 5.17.
+type VolumeNorm int
+
+// 5.17 Volume Normalization Modes
 const (
-	QAGAll    = 1
-	QAGOver12 = 2
-	QAGMature = 3
+	VolumeNormNone     VolumeNorm = 0
+	VolumeNormAverage  VolumeNorm = 1
+	VolumeNormPeak     VolumeNorm = 2
+	VolumeNormLoudness VolumeNorm = 3
+	VolumeNormCustom   VolumeNorm = 4
 )
 
-// 5.16 Location Type
+// ContentContext as defined in section 5.18.
+type ContentContext int
+
+// UnmarshalJSON implements json.Unmarshaler
+func (n *ContentContext) UnmarshalJSON(data []byte) (err error) {
+	var v int
+
+	if len(data) > 2 && data[0] == '"' && data[len(data)-1] == '"' {
+		err = json.Unmarshal(data[1:len(data)-1], &v)
+	} else {
+		err = json.Unmarshal(data, &v)
+	}
+	if err != nil {
+		return err
+	}
+
+	*n = ContentContext(v)
+	return nil
+}
+
+// 5.18 Content Context
 const (
-	LocationTypeGPS  = 1
-	LocationTypeIP   = 2
-	LocationTypeUser = 3
+	ContentContextVideo       ContentContext = 1
+	ContentContextGame        ContentContext = 2
+	ContentContextMusic       ContentContext = 3
+	ContentContextApplication ContentContext = 4
+	ContentContextText        ContentContext = 5
+	ContentContextOther       ContentContext = 6
+	ContentContextUnknown     ContentContext = 7
 )
 
-// 5.17 Device Type
+// IQGRating as defined in section 5.19.
+type IQGRating int
+
+// 5.19 IQG Media Ratings
 const (
-	DeviceTypeUnknown   = 0
-	DeviceTypeMobile    = 1
-	DeviceTypePC        = 2
-	DeviceTypeTV        = 3
-	DeviceTypePhone     = 4
-	DeviceTypeTablet    = 5
-	DeviceTypeConnected = 6
-	DeviceTypeSetTopBox = 7
+	IQGRatingUnknown IQGRating = 0
+	IQGRatingAll     IQGRating = 1
+	IQGRatingOver12  IQGRating = 2
+	IQGRatingMature  IQGRating = 3
 )
 
-// 5.18 Connection Type
+// LocationType as defined in section 5.20.
+type LocationType int
+
+// 5.20 Location Type
+const (
+	LocationTypeUnknown LocationType = 0
+	LocationTypeGPS     LocationType = 1
+	LocationTypeIP      LocationType = 2
+	LocationTypeUser    LocationType = 3
+)
+
+// DeviceType as defined in section 5.21.
+type DeviceType int
+
+// 5.21 Device Type
+const (
+	DeviceTypeUnknown   DeviceType = 0
+	DeviceTypeMobile    DeviceType = 1
+	DeviceTypePC        DeviceType = 2
+	DeviceTypeTV        DeviceType = 3
+	DeviceTypePhone     DeviceType = 4
+	DeviceTypeTablet    DeviceType = 5
+	DeviceTypeConnected DeviceType = 6
+	DeviceTypeSetTopBox DeviceType = 7
+)
+
+// ConnType as defined in section 5.22.
+type ConnType int
+
+// 5.22 Connection Type
+const (
+	ConnTypeUnknown  ConnType = 0
+	ConnTypeEthernet ConnType = 1
+	ConnTypeWIFI     ConnType = 2
+	ConnTypeCell     ConnType = 3
+	ConnTypeCell2G   ConnType = 4
+	ConnTypeCell3G   ConnType = 5
+	ConnTypeCell4G   ConnType = 6
+)
+
+// IPLocation as defined in section 5.23.
+type IPLocation int
+
+// 5.22 IP Location Services
 const (
-	ConnTypeUnknown  = 0
-	ConnTypeEthernet = 1
-	ConnTypeWIFI     = 2
-	ConnTypeCell     = 3
-	ConnTypeCell2G   = 4
-	ConnTypeCell3G   = 5
-	ConnTypeCell4G   = 6
+	IPLocationUnknown     IPLocation = 0
+	IPLocationIP2Location IPLocation = 1
+	IPLocationNeustar     IPLocation = 2
+	IPLocationMaxMind     IPLocation = 3
+	IPLocationNetAquity   IPLocation = 4
 )
 
-// 5.19 No-Bid Reason Codes
+// NBR as defined in section 5.24.
+type NBR int
+
+// 5.24 No-Bid Reason Codes
 const (
-	NBRUnknownError      = 0
-	NBRTechnicalError    = 1
-	NBRInvalidRequest    = 2
-	NBRKnownSpider       = 3
-	NBRSuspectedNonHuman = 4
-	NBRProxyIP           = 5
-	NBRUnsupportedDevice = 6
-	NBRBlockedSite       = 7
-	NBRUnmatchedUser     = 8
+	NBRUnknownError      NBR = 0
+	NBRTechnicalError    NBR = 1
+	NBRInvalidRequest    NBR = 2
+	NBRKnownSpider       NBR = 3
+	NBRSuspectedNonHuman NBR = 4
+	NBRProxyIP           NBR = 5
+	NBRUnsupportedDevice NBR = 6
+	NBRBlockedSite       NBR = 7
+	NBRUnmatchedUser     NBR = 8
 )
 
 /*************************************************************************
@@ -199,64 +744,64 @@ const (
 // type Content struct {
 // }
 
-// Abstract third-party
+// ThirdParty abstract attributes.
 type ThirdParty struct {
-	ID     string          `json:"id,omitempty"`
-	Name   string          `json:"name,omitempty"`
-	Cat    []string        `json:"cat,omitempty"` // Array of IAB content categories
-	Domain string          `json:"domain,omitempty"`
-	Ext    json.RawMessage `json:"ext,omitempty"`
+	ID         string            `json:"id,omitempty"`
+	Name       string            `json:"name,omitempty"`
+	Categories []ContentCategory `json:"cat,omitempty"` // Array of IAB content categories
+	Domain     string            `json:"domain,omitempty"`
+	Ext        json.RawMessage   `json:"ext,omitempty"`
 }
 
-// The publisher object itself and all of its parameters are optional, so default values are not
+// Publisher object itself and all of its parameters are optional, so default values are not
 // provided. If an optional parameter is not specified, it should be considered unknown.
 type Publisher ThirdParty
 
-// The producer is useful when content where the ad is shown is syndicated, and may appear on a
+// Producer is useful when content where the ad is shown is syndicated, and may appear on a
 // completely different publisher. The producer object itself and all of its parameters are optional,
 // so default values are not provided. If an optional parameter is not specified, it should be
 // considered unknown.
 type Producer ThirdParty
 
-// Note that the Geo Object may appear in one or both the Device Object and the User Object.
+// Geo object may appear in one or both the Device Object and the User Object.
 // This is intentional, since the information may be derived from either a device-oriented source
 // (such as IP geo lookup), or by user registration information (for example provided to a publisher
 // through a user registration).
 type Geo struct {
-	Lat           float64         `json:"lat,omitempty"`           // Latitude from -90 to 90
-	Lon           float64         `json:"lon,omitempty"`           // Longitude from -180 to 180
-	Type          int             `json:"type,omitempty"`          // Indicate the source of the geo data
+	Latitude      float64         `json:"lat,omitempty"`           // Latitude from -90 to 90
+	Longitude     float64         `json:"lon,omitempty"`           // Longitude from -180 to 180
+	Type          LocationType    `json:"type,omitempty"`          // Indicate the source of the geo data
 	Accuracy      int             `json:"accuracy,omitempty"`      // Estimated location accuracy in meters; recommended when lat/lon are specified and derived from a device’s location services
 	LastFix       int             `json:"lastfix,omitempty"`       // Number of seconds since this geolocation fix was established.
-	IPService     int             `json:"ipservice,omitempty"`     // Service or provider used to determine geolocation from IP address if applicable
+	IPService     IPLocation      `json:"ipservice,omitempty"`     // Service or provider used to determine geolocation from IP address if applicable
 	Country       string          `json:"country,omitempty"`       // Country using ISO 3166-1 Alpha 3
 	Region        string          `json:"region,omitempty"`        // Region using ISO 3166-2
 	RegionFIPS104 string          `json:"regionFIPS104,omitempty"` // Region of a country using FIPS 10-4
 	Metro         string          `json:"metro,omitempty"`
 	City          string          `json:"city,omitempty"`
-	Zip           string          `json:"zip,omitempty"`
+	ZIP           string          `json:"zip,omitempty"`
 	UTCOffset     int             `json:"utcoffset,omitempty"` // Local time as the number +/- of minutes from UTC
 	Ext           json.RawMessage `json:"ext,omitempty"`
 }
 
-// This object contains information known or derived about the human user of the device (i.e., the
+// User object contains information known or derived about the human user of the device (i.e., the
 // audience for advertising). The user id is an exchange artifact and may be subject to rotation or other
 // privacy policies. However, this user ID must be stable long enough to serve reasonably as the basis for
 // frequency capping and retargeting.
 type User struct {
-	ID         string          `json:"id,omitempty"`         // Unique consumer ID of this user on the exchange
-	BuyerID    string          `json:"buyerid,omitempty"`    // Buyer-specific ID for the user as mapped by the exchange for the buyer. At least one of buyeruid/buyerid or id is recommended. Valid for OpenRTB 2.3.
-	BuyerUID   string          `json:"buyeruid,omitempty"`   // Buyer-specific ID for the user as mapped by the exchange for the buyer. Same as BuyerID but valid for OpenRTB 2.2.
-	YOB        int             `json:"yob,omitempty"`        // Year of birth as a 4-digit integer.
-	Gender     string          `json:"gender,omitempty"`     // Gender ("M": male, "F" female, "O" Other)
-	Keywords   string          `json:"keywords,omitempty"`   // Comma separated list of keywords, interests, or intent
-	CustomData string          `json:"customdata,omitempty"` // Optional feature to pass bidder data that was set in the exchange's cookie. The string must be in base85 cookie safe characters and be in any format. Proper JSON encoding must be used to include "escaped" quotation marks.
-	Geo        *Geo            `json:"geo,omitempty"`
-	Data       []Data          `json:"data,omitempty"`
-	Ext        json.RawMessage `json:"ext,omitempty"`
+	ID          string          `json:"id,omitempty"`         // Unique consumer ID of this user on the exchange
+	BuyerID     string          `json:"buyerid,omitempty"`    // Buyer-specific ID for the user as mapped by the exchange for the buyer. At least one of buyeruid/buyerid or id is recommended. Valid for OpenRTB 2.3.
+	BuyerUID    string          `json:"buyeruid,omitempty"`   // Buyer-specific ID for the user as mapped by the exchange for the buyer. Same as BuyerID but valid for OpenRTB 2.2.
+	YearOfBirth int             `json:"yob,omitempty"`        // Year of birth as a 4-digit integer.
+	Gender      string          `json:"gender,omitempty"`     // Gender ("M": male, "F" female, "O" Other)
+	Keywords    string          `json:"keywords,omitempty"`   // Comma separated list of keywords, interests, or intent
+	CustomData  string          `json:"customdata,omitempty"` // Optional feature to pass bidder data that was set in the exchange's cookie. The string must be in base85 cookie safe characters and be in any format. Proper JSON encoding must be used to include "escaped" quotation marks.
+	Geo         *Geo            `json:"geo,omitempty"`
+	Data        []Data          `json:"data,omitempty"`
+	Ext         json.RawMessage `json:"ext,omitempty"`
 }
 
-// The data and segment objects together allow additional data about the user to be specified. This data
+// Data and segment objects together allow additional data about the user to be specified. This data
 // may be from multiple sources whether from the exchange itself or third party providers as specified by
 // the id field. A bid request can mix data objects from multiple providers. The specific data providers in
 // use should be published by the exchange a priori to its bidders.
@@ -277,18 +822,18 @@ type Segment struct {
 	Ext   json.RawMessage `json:"ext,omitempty"`
 }
 
-// This object contains any legal, governmental, or industry regulations that apply to the request. The
+// Regulations object contains any legal, governmental, or industry regulations that apply to the request. The
 // coppa flag signals whether or not the request falls under the United States Federal Trade Commission's
 // regulations for the United States Children's Online Privacy Protection Act ("COPPA").
 type Regulations struct {
-	Coppa int             `json:"coppa,omitempty"` // Flag indicating if this request is subject to the COPPA regulations established by the USA FTC, where 0 = no, 1 = yes.
+	COPPA int             `json:"coppa,omitempty"` // Flag indicating if this request is subject to the COPPA regulations established by the USA FTC, where 0 = no, 1 = yes.
 	Ext   json.RawMessage `json:"ext,omitempty"`
 }
 
-// This object represents an allowed size (i.e., height and width combination) for a banner impression.
+// Format object represents an allowed size (i.e., height and width combination) for a banner impression.
 // These are typically used in an array for an impression where multiple sizes are permitted.
 type Format struct {
-	W   int             `json:"w,omitempty"` // Width in device independent pixels (DIPS).
-	H   int             `json:"h,omitempty"` //Height in device independent pixels (DIPS).
-	Ext json.RawMessage `json:"ext,omitempty"`
+	Width  int             `json:"w,omitempty"` // Width in device independent pixels (DIPS).
+	Height int             `json:"h,omitempty"` //Height in device independent pixels (DIPS).
+	Ext    json.RawMessage `json:"ext,omitempty"`
 }
diff --git a/openrtb_test.go b/openrtb_test.go
index 8d1dcbb..f07c35d 100644
--- a/openrtb_test.go
+++ b/openrtb_test.go
@@ -15,13 +15,12 @@ func TestSuite(t *testing.T) {
 	RunSpecs(t, "openrtb")
 }
 
-func iptr(n int) *int       { return &n }
-
 func fixture(fname string, v interface{}) error {
 	f, err := os.Open(filepath.Join("testdata", fname+".json"))
 	if err != nil {
 		return err
 	}
 	defer f.Close()
+
 	return json.NewDecoder(f).Decode(v)
 }
diff --git a/pmp.go b/pmp.go
index cb0af82..5d6b53c 100644
--- a/pmp.go
+++ b/pmp.go
@@ -2,25 +2,22 @@ package openrtb
 
 import "encoding/json"
 
-// Private Marketplace Object
-type Pmp struct {
+// PMP is the Private Marketplace Object
+type PMP struct {
 	Private int             `json:"private_auction,omitempty"`
 	Deals   []Deal          `json:"deals,omitempty"`
 	Ext     json.RawMessage `json:"ext,omitempty"`
 }
 
-// PMP Deal
+// Deal contains PMP deal information.
 type Deal struct {
 	ID               string          `json:"id,omitempty"` // Unique deal ID
 	BidFloor         float64         `json:"bidfloor,omitempty"`
 	BidFloorCurrency string          `json:"bidfloorcur,omitempty"` // Currency of bid floor
-	WSeat            []string        `json:"wseat,omitempty"`       // Array of buyer seats allowed to bid on this Direct Deal.
-	WAdvDomain       []string        `json:"wadomain,omitempty"`    // Array of advertiser domains allowed to bid on this Direct Deal
+	Seats            []string        `json:"wseat,omitempty"`       // Array of buyer seats allowed to bid on this Direct Deal.
+	AdvDomains       []string        `json:"wadomain,omitempty"`    // Array of advertiser domains allowed to bid on this Direct Deal
 	AuctionType      int             `json:"at,omitempty"`          // Optional override of the overall auction type of the bid request, where 1 = First Price, 2 = Second Price Plus, 3 = the value passed in bidfloor is the agreed upon deal price. Additional auction types can be defined by the exchange.
 	Ext              json.RawMessage `json:"ext,omitempty"`
-
-	Seats []string `json:"seats,omitempty"` // DEPRECATED: kept for backwards compatibility
-	Type  int      `json:"type,omitempty"`  // DEPRECATED: kept for backwards compatibility
 }
 
 type jsonDeal Deal
diff --git a/pmp_test.go b/pmp_test.go
index 2f16436..20a852c 100644
--- a/pmp_test.go
+++ b/pmp_test.go
@@ -7,16 +7,15 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-var _ = Describe("Pmp", func() {
-	var subject *Pmp
+var _ = Describe("PMP", func() {
+	var subject *PMP
 
 	BeforeEach(func() {
-		err := fixture("pmp", &subject)
-		Expect(err).NotTo(HaveOccurred())
+		Expect(fixture("pmp", &subject)).To(Succeed())
 	})
 
 	It("should parse correctly", func() {
-		Expect(subject).To(Equal(&Pmp{
+		Expect(subject).To(Equal(&PMP{
 			Private: 1,
 			Deals: []Deal{
 				{ID: "DX-1985-010A", BidFloor: 2.5, BidFloorCurrency: "", AuctionType: 2},
@@ -26,9 +25,7 @@ var _ = Describe("Pmp", func() {
 	})
 
 	It("should generate correctly", func() {
-		bin, err := json.Marshal(&Pmp{Deals: []Deal{{}}})
-		Expect(err).NotTo(HaveOccurred())
-		Expect(string(bin)).To(Equal(`{"deals":[{"at":2}]}`))
+		Expect(json.Marshal(&PMP{Deals: []Deal{{}}})).To(MatchJSON(`{"deals":[{"at":2}]}`))
 	})
 
 })
diff --git a/seatbid.go b/seatbid.go
index a8881d4..6e601fe 100644
--- a/seatbid.go
+++ b/seatbid.go
@@ -5,14 +5,14 @@ import (
 	"errors"
 )
 
-// At least one of Bid is required.
+// SeatBid contains seat information. At least one of Bid is required.
 // A bid response can contain multiple "seatbid” objects, each on behalf of a different bidder seat.
 // SeatBid object can contain multiple bids each pertaining to a different impression on behalf of a seat.
 // Each "bid” object must include the impression ID to which it pertains as well as the bid price.
 // Group attribute can be used to specify if a seat is willing to accept any impressions that it can win (default) or if it is
 // only interested in winning any if it can win them all (i.e., all or nothing).
 type SeatBid struct {
-	Bid   []Bid           `json:"bid"`             // Array of bid objects; each realtes to an imp, if exchange supported can have many bid objects.
+	Bids  []Bid           `json:"bid"`             // Array of bid objects; each realtes to an imp, if exchange supported can have many bid objects.
 	Seat  string          `json:"seat,omitempty"`  // ID of the bidder seat optional string ID of the bidder seat on whose behalf this bid is made.
 	Group int             `json:"group,omitempty"` // '1' means impression must be won-lost as a group; default is '0'.
 	Ext   json.RawMessage `json:"ext,omitempty"`
@@ -25,12 +25,13 @@ var (
 
 // Validate required attributes
 func (sb *SeatBid) Validate() error {
-	if len(sb.Bid) == 0 {
+	if len(sb.Bids) == 0 {
 		return ErrInvalidSeatBidBid
 	}
 
-	for _, bid := range sb.Bid {
-		if err := bid.Validate(); err != nil {
+	for i := range sb.Bids {
+		bid := sb.Bids[i]
+		if err := (&bid).Validate(); err != nil {
 			return err
 		}
 	}
diff --git a/seatbid_test.go b/seatbid_test.go
index 323cd8e..9cf7697 100644
--- a/seatbid_test.go
+++ b/seatbid_test.go
@@ -6,12 +6,10 @@ import (
 )
 
 var _ = Describe("SeatBid", func() {
-
 	It("should validate", func() {
 		Expect((&SeatBid{}).Validate()).To(Equal(ErrInvalidSeatBidBid))
-		Expect((&SeatBid{Bid: []Bid{
+		Expect((&SeatBid{Bids: []Bid{
 			{ID: "BIDID", ImpID: "IMPID"}},
 		}).Validate()).NotTo(HaveOccurred())
 	})
-
 })
diff --git a/video.go b/video.go
index 32360d9..87e2fca 100644
--- a/video.go
+++ b/video.go
@@ -7,50 +7,50 @@ import (
 
 // Validation errors
 var (
-	ErrInvalidVideoNoMimes       = errors.New("openrtb: video has no mimes")
+	ErrInvalidVideoNoMIMEs       = errors.New("openrtb: video has no mimes")
 	ErrInvalidVideoNoLinearity   = errors.New("openrtb: video linearity missing")
 	ErrInvalidVideoNoMinDuration = errors.New("openrtb: video min-duration missing")
 	ErrInvalidVideoNoMaxDuration = errors.New("openrtb: video max-duration missing")
 	ErrInvalidVideoNoProtocols   = errors.New("openrtb: video protocols missing")
 )
 
-// The "video" object must be included directly in the impression object if the impression offered
+// Video object must be included directly in the impression object if the impression offered
 // for auction is an in-stream video ad opportunity.
 type Video struct {
-	Mimes          []string        `json:"mimes,omitempty"`          // Content MIME types supported.
-	MinDuration    int             `json:"minduration,omitempty"`    // Minimum video ad duration in seconds
-	MaxDuration    int             `json:"maxduration,omitempty"`    // Maximum video ad duration in seconds
-	Protocols      []int           `json:"protocols,omitempty"`      // Video bid response protocols
-	Protocol       int             `json:"protocol,omitempty"`       // Video bid response protocols DEPRECATED
-	W              int             `json:"w,omitempty"`              // Width of the player in pixels
-	H              int             `json:"h,omitempty"`              // Height of the player in pixels
-	StartDelay     int             `json:"startdelay,omitempty"`     // Indicates the start delay in seconds
-	Linearity      int             `json:"linearity,omitempty"`      // Indicates whether the ad impression is linear or non-linear
-	Skip           int             `json:"skip,omitempty"`           // Indicates if the player will allow the video to be skipped, where 0 = no, 1 = yes.
-	SkipMin        int             `json:"skipmin,omitempty"`        // Videos of total duration greater than this number of seconds can be skippable
-	SkipAfter      int             `json:"skipafter,omitempty"`      // Number of seconds a video must play before skipping is enabled
-	Sequence       int             `json:"sequence,omitempty"`       // Default: 1
-	BAttr          []int           `json:"battr,omitempty"`          // Blocked creative attributes
-	MaxExtended    int             `json:"maxextended,omitempty"`    // Maximum extended video ad duration
-	MinBitrate     int             `json:"minbitrate,omitempty"`     // Minimum bit rate in Kbps
-	MaxBitrate     int             `json:"maxbitrate,omitempty"`     // Maximum bit rate in Kbps
-	BoxingAllowed  *int            `json:"boxingallowed,omitempty"`  // If exchange publisher has rules preventing letter boxing
-	PlaybackMethod []int           `json:"playbackmethod,omitempty"` // List of allowed playback methods
-	Delivery       []int           `json:"delivery,omitempty"`       // List of supported delivery methods
-	Pos            int             `json:"pos,omitempty"`            // Ad Position
-	CompanionAd    []Banner        `json:"companionad,omitempty"`
-	Api            []int           `json:"api,omitempty"` // List of supported API frameworks
-	CompanionType  []int           `json:"companiontype,omitempty"`
-	Placement      int             `json:"placement,omitempty"` // Video placement type
-	Ext            json.RawMessage `json:"ext,omitempty"`
+	MIMEs           []string            `json:"mimes,omitempty"`          // Content MIME types supported.
+	MinDuration     int                 `json:"minduration,omitempty"`    // Minimum video ad duration in seconds
+	MaxDuration     int                 `json:"maxduration,omitempty"`    // Maximum video ad duration in seconds
+	Protocols       []Protocol          `json:"protocols,omitempty"`      // Video bid response protocols
+	Protocol        Protocol            `json:"protocol,omitempty"`       // Video bid response protocols DEPRECATED
+	Width           int                 `json:"w,omitempty"`              // Width of the player in pixels
+	Height          int                 `json:"h,omitempty"`              // Height of the player in pixels
+	StartDelay      StartDelay          `json:"startdelay,omitempty"`     // Indicates the start delay in seconds
+	Linearity       VideoLinearity      `json:"linearity,omitempty"`      // Indicates whether the ad impression is linear or non-linear
+	Skip            int                 `json:"skip,omitempty"`           // Indicates if the player will allow the video to be skipped, where 0 = no, 1 = yes.
+	SkipMin         int                 `json:"skipmin,omitempty"`        // Videos of total duration greater than this number of seconds can be skippable
+	SkipAfter       int                 `json:"skipafter,omitempty"`      // Number of seconds a video must play before skipping is enabled
+	Sequence        int                 `json:"sequence,omitempty"`       // Default: 1
+	BlockedAttrs    []CreativeAttribute `json:"battr,omitempty"`          // Blocked creative attributes
+	MaxExtended     int                 `json:"maxextended,omitempty"`    // Maximum extended video ad duration
+	MinBitrate      int                 `json:"minbitrate,omitempty"`     // Minimum bit rate in Kbps
+	MaxBitrate      int                 `json:"maxbitrate,omitempty"`     // Maximum bit rate in Kbps
+	BoxingAllowed   *int                `json:"boxingallowed,omitempty"`  // If exchange publisher has rules preventing letter boxing
+	PlaybackMethods []VideoPlayback     `json:"playbackmethod,omitempty"` // List of allowed playback methods
+	Delivery        []ContentDelivery   `json:"delivery,omitempty"`       // List of supported delivery methods
+	Position        AdPosition          `json:"pos,omitempty"`            // Ad Position
+	CompanionAds    []Banner            `json:"companionad,omitempty"`
+	APIs            []APIFramework      `json:"api,omitempty"` // List of supported API frameworks
+	CompanionTypes  []CompanionType     `json:"companiontype,omitempty"`
+	Placement       VideoPlacement      `json:"placement,omitempty"` // Video placement type
+	Ext             json.RawMessage     `json:"ext,omitempty"`
 }
 
 type jsonVideo Video
 
-// Validates the object
+// Validate the object
 func (v *Video) Validate() error {
-	if len(v.Mimes) == 0 {
-		return ErrInvalidVideoNoMimes
+	if len(v.MIMEs) == 0 {
+		return ErrInvalidVideoNoMIMEs
 	} else if v.Linearity == 0 {
 		return ErrInvalidVideoNoLinearity
 	} else if v.MinDuration == 0 {
diff --git a/video_test.go b/video_test.go
index c2e3c9a..196d367 100644
--- a/video_test.go
+++ b/video_test.go
@@ -9,70 +9,69 @@ var _ = Describe("Video", func() {
 	var subject *Video
 
 	BeforeEach(func() {
-		err := fixture("video", &subject)
-		Expect(err).NotTo(HaveOccurred())
+		Expect(fixture("video", &subject)).To(Succeed())
 	})
 
 	It("should parse correctly", func() {
+		boxingAllowed := 1
 		Expect(subject).To(Equal(&Video{
-			Mimes: []string{
+			MIMEs: []string{
 				"video/x-flv",
 				"video/mp4",
 				"application/x-shockwave-flash",
 				"application/javascript",
 			},
-			MinDuration:    5,
-			MaxDuration:    30,
-			Protocols:      []int{VideoProtoVAST2, VideoProtoVAST3},
-			W:              640,
-			H:              480,
-			Linearity:      VideoLinearityLinear,
-			Sequence:       1,
-			BAttr:          []int{CreativeAttributeUserInitiated, CreativeAttributeWindowsDialogOrAlert},
-			MaxExtended:    30,
-			MinBitrate:     300,
-			MaxBitrate:     1500,
-			BoxingAllowed:  iptr(1),
-			PlaybackMethod: []int{VideoPlaybackAutoSoundOn, VideoPlaybackClickToPlay},
-			Delivery:       []int{ContentDeliveryProgressive},
-			Pos:            AdPosAboveFold,
-			CompanionAd: []Banner{
-				{W: 300, H: 250, ID: "1234567893-1", Pos: AdPosAboveFold, BAttr: []int{CreativeAttributeUserInitiated, CreativeAttributeWindowsDialogOrAlert}, ExpDir: []int{ExpDirRight, ExpDirDown}},
-				{W: 728, H: 90, ID: "1234567893-2", Pos: AdPosAboveFold, BAttr: []int{CreativeAttributeUserInitiated, CreativeAttributeWindowsDialogOrAlert}},
+			MinDuration:     5,
+			MaxDuration:     30,
+			Protocols:       []Protocol{ProtocolVAST2, ProtocolVAST3},
+			Width:           640,
+			Height:          480,
+			Linearity:       VideoLinearityLinear,
+			Sequence:        1,
+			BlockedAttrs:    []CreativeAttribute{CreativeAttributeUserInitiated, CreativeAttributeWindowsDialogOrAlert},
+			MaxExtended:     30,
+			MinBitrate:      300,
+			MaxBitrate:      1500,
+			BoxingAllowed:   &boxingAllowed,
+			PlaybackMethods: []VideoPlayback{VideoPlaybackPageLoadSoundOn, VideoPlaybackClickToPlay},
+			Delivery:        []ContentDelivery{ContentDeliveryProgressive},
+			Position:        AdPositionAboveFold,
+			CompanionAds: []Banner{
+				{Width: 300, Height: 250, ID: "1234567893-1", Position: AdPositionAboveFold, BlockedAttrs: []CreativeAttribute{CreativeAttributeUserInitiated, CreativeAttributeWindowsDialogOrAlert}, ExpDirs: []ExpDir{ExpDirRight, ExpDirDown}},
+				{Width: 728, Height: 90, ID: "1234567893-2", Position: AdPositionAboveFold, BlockedAttrs: []CreativeAttribute{CreativeAttributeUserInitiated, CreativeAttributeWindowsDialogOrAlert}},
 			},
-			Placement:     VideoPlacementInStream,
-			Api:           []int{APIFrameworkVPAID1, APIFrameworkVPAID2},
-			CompanionType: []int{VASTCompanionStatic, VASTCompanionHTML},
+			Placement:      VideoPlacementInStream,
+			APIs:           []APIFramework{APIFrameworkVPAID1, APIFrameworkVPAID2},
+			CompanionTypes: []CompanionType{CompanionTypeStatic, CompanionTypeHTML},
 		}))
 	})
 
 	It("should validate", func() {
-		Expect((&Video{}).Validate()).To(Equal(ErrInvalidVideoNoMimes))
+		Expect((&Video{}).Validate()).To(Equal(ErrInvalidVideoNoMIMEs))
 		Expect((&Video{
-			Mimes: []string{"video/mp4"},
+			MIMEs: []string{"video/mp4"},
 		}).Validate()).To(Equal(ErrInvalidVideoNoLinearity))
 		Expect((&Video{
 			Linearity: VideoLinearityNonLinear,
-			Mimes:     []string{"video/mp4"},
+			MIMEs:     []string{"video/mp4"},
 		}).Validate()).To(Equal(ErrInvalidVideoNoMinDuration))
 		Expect((&Video{
 			MinDuration: 1,
 			Linearity:   VideoLinearityNonLinear,
-			Mimes:       []string{"video/mp4"},
+			MIMEs:       []string{"video/mp4"},
 		}).Validate()).To(Equal(ErrInvalidVideoNoMaxDuration))
 		Expect((&Video{
 			MinDuration: 1,
 			MaxDuration: 1,
 			Linearity:   VideoLinearityNonLinear,
-			Mimes:       []string{"video/mp4"},
+			MIMEs:       []string{"video/mp4"},
 		}).Validate()).To(Equal(ErrInvalidVideoNoProtocols))
 		Expect((&Video{
-			Protocol:    VideoProtoVAST3,
+			Protocol:    ProtocolVAST3,
 			MinDuration: 1,
 			MaxDuration: 1,
 			Linearity:   VideoLinearityNonLinear,
-			Mimes:       []string{"video/mp4"},
+			MIMEs:       []string{"video/mp4"},
 		}).Validate()).NotTo(HaveOccurred())
 	})
-
 })