diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..0157694
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,12 @@
+root = true
+
+[*]
+indent_style = tab
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.{json,rb,md,yml,yaml,feature}]
+indent_style = space
+indent_size = 2
diff --git a/.travis.yml b/.travis.yml
index 98f31ec..62da91f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: go
-install: make test
+sudo: false
 go:
-  - 1.2
-  - 1.3
-  - 1.4
-
+  - 1.6.4
+  - 1.7.4
+install:
+  - go get -u -t ./...
diff --git a/Makefile b/Makefile
index 2583a86..7e42be8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,10 @@
-default: test
+default: vet test
 
-deps:
-	go get -t ./...
+test:
+	go test -a ./...
 
-test: deps
-	go test ./...
+bench:
+	go test ./... -bench=. -run=NONE
+
+vet:
+	go vet ./...
diff --git a/README.md b/README.md
index c781bb5..04d30a2 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Go OpenRTB 2.2 
+# Go OpenRTB v2.x
 
 [![Build Status](https://travis-ci.org/bsm/openrtb.svg?branch=master)](https://travis-ci.org/bsm/openrtb)
 
@@ -8,39 +8,42 @@ OpenRTB implementation for Go
 
 To install, use `go get`:
 
-    go get github.com/bsm/openrtb
+```shell
+go get github.com/bsm/openrtb
+```
 
-To update, use `go get -u`:
-
-    go get -u github.com/bsm/openrtb
+## Usage
 
 Import the package:
 
-    package main
-
-    import (
-      "github.com/bsm/openrtb"
-    )
+```go
+package main
 
-## Example
+import (
+  "log"
+  "github.com/bsm/openrtb"
+)
 
-    // Handle a HTTP request
-    http.HandleFunc("/bid", func(w http.ResponseWriter, r *http.Request) {
-      defer r.Body().Close()
+func main() {
+  file, err := os.Open("stored.json")
+  if err != nil {
+    log.Fatal(err)
+  }
+  defer file.Close()
 
-      req, err := openrtb.ParseRequest(r.Body(), true)
-      if err != nil {
-        log.Println("ERROR %s", err.Error())
-      } else {
-        log.Println("INFO  Received bid request %s", *req.Id)
-      }
+  var req *openrtb.BidRequest
+  err = json.NewDecoder(file).Decode(&req)
+  if err != nil {
+    log.Fatal(err)
+  }
 
-      w.WriteHeader(204) // respond with 'no bid'
-    })
+  log.Printf("%+v\n", req)
+}
+```
 
 ## Licence
 
-    Copyright (c) 2014 Black Square Media Ltd. All rights reserved.
+    Copyright (c) 2015 Black Square Media Ltd. All rights reserved.
     (The MIT License)
 
     Permission is hereby granted, free of charge, to any person obtaining
@@ -61,3 +64,6 @@ Import the package:
     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/app.go b/app.go
deleted file mode 100644
index 2fe05d3..0000000
--- a/app.go
+++ /dev/null
@@ -1,51 +0,0 @@
-package openrtb
-
-// An "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 {
-	Id            *string    `json:"id,omitempty"`   // App ID on the exchange
-	Name          *string    `json:"name,omitempty"` // App name
-	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
-	Ver           *string    `json:"ver,omitempty"`           // App version
-	Bundle        *string    `json:"bundle,omitempty"`        // App bundle or package name
-	Privacypolicy *int       `json:"privacypolicy,omitempty"` // Default: 1 ("1": site has a privacy policy)
-	Paid          *int       `json:"paid,omitempty"`          // "1": Paid, "2": Free
-	Publisher     *Publisher `json:"publisher,omitempty"`
-	// Content       Content
-	Keywords *string    `json:"keywords,omitempty"`
-	Storeurl *string    `json:"storeurl,omitempty"` // App store URL for an installed app
-	Ext      Extensions `json:"ext,omitempty"`
-}
-
-// Returns the privacy policy status, with default fallback
-func (a *App) IsPrivacyPolicy() bool {
-	if a.Privacypolicy != nil {
-		return *a.Privacypolicy == 1
-	}
-	return false
-}
-
-// Returns the paid status, with default fallback
-func (a *App) IsPaid() bool {
-	if a.Paid != nil {
-		return *a.Paid == 1
-	}
-	return false
-}
-
-// Applies defaults
-func (a *App) WithDefaults() *App {
-	if a.Privacypolicy == nil {
-		a.Privacypolicy = new(int)
-		*a.Privacypolicy = 0
-	}
-	if a.Paid == nil {
-		a.Paid = new(int)
-		*a.Paid = 0
-	}
-	return a
-}
diff --git a/app_test.go b/app_test.go
deleted file mode 100644
index a9a8399..0000000
--- a/app_test.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package openrtb
-
-import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-)
-
-var _ = Describe("App", func() {
-	var subject *App
-
-	BeforeEach(func() {
-		subject = new(App)
-	})
-
-	It("should have accessors", func() {
-		Expect(subject.IsPrivacyPolicy()).To(BeFalse())
-		Expect(subject.IsPaid()).To(BeFalse())
-	})
-
-	It("should have defaults", func() {
-		subject.WithDefaults()
-		Expect(*subject.Privacypolicy).To(Equal(0))
-		Expect(*subject.Paid).To(Equal(0))
-	})
-})
diff --git a/audio.go b/audio.go
new file mode 100644
index 0000000..5dd8a03
--- /dev/null
+++ b/audio.go
@@ -0,0 +1,68 @@
+package openrtb
+
+import (
+	"encoding/json"
+	"errors"
+)
+
+// Validation errors
+var (
+	ErrInvalidAudioNoMimes = errors.New("openrtb: audio has no mimes")
+)
+
+// The "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           Extension `json:"ext,omitempty"`
+}
+
+type jsonAudio Audio
+
+// Validates the object
+func (a *Audio) Validate() error {
+	if len(a.Mimes) == 0 {
+		return ErrInvalidAudioNoMimes
+	}
+	return nil
+}
+
+// MarshalJSON custom marshalling with normalization
+func (a *Audio) MarshalJSON() ([]byte, error) {
+	a.normalize()
+	return json.Marshal((*jsonAudio)(a))
+}
+
+// UnmarshalJSON custom unmarshalling with normalization
+func (a *Audio) UnmarshalJSON(data []byte) error {
+	var h jsonAudio
+	if err := json.Unmarshal(data, &h); err != nil {
+		return err
+	}
+
+	*a = (Audio)(h)
+	a.normalize()
+	return nil
+}
+
+func (a *Audio) normalize() {
+	if a.Sequence == 0 {
+		a.Sequence = 1
+	}
+}
diff --git a/audio_test.go b/audio_test.go
new file mode 100644
index 0000000..fe09cea
--- /dev/null
+++ b/audio_test.go
@@ -0,0 +1,58 @@
+package openrtb
+
+import (
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("Audio", func() {
+	var subject *Audio
+
+	BeforeEach(func() {
+		err := fixture("audio", &subject)
+		Expect(err).NotTo(HaveOccurred())
+	})
+
+	It("should parse correctly", func() {
+		Expect(subject).To(Equal(&Audio{
+			Mimes: []string{
+				"audio/mp4",
+			},
+			MinDuration: 5,
+			MaxDuration: 30,
+			Protocols:   []int{AudioProtocolDAAST1, AudioProtocolDAAST1Wrapper},
+			Sequence:    1,
+			BAttr:       []int{13, 14},
+			MaxExtended: 30,
+			MinBitrate:  300,
+			MaxBitrate:  1500,
+			Delivery:    []int{2},
+			CompanionAd: []Banner{
+				{W: 300, H: 250, ID: "1234567893-1", Pos: 1, BAttr: []int{13, 14}, ExpDir: []int{ExpDirRight, ExpDirDown}},
+				{W: 728, H: 90, ID: "1234567893-2", Pos: 1, BAttr: []int{13, 14}},
+			},
+			API:           []int{1, 2},
+			CompanionType: []int{1, 2},
+		}))
+	})
+
+	It("should validate", func() {
+		Expect((&Audio{
+			MinDuration: 5,
+			MaxDuration: 30,
+			Protocols:   []int{AudioProtocolDAAST1, AudioProtocolDAAST1Wrapper},
+			Sequence:    1,
+			BAttr:       []int{13, 14},
+			MaxExtended: 30,
+			MinBitrate:  300,
+			MaxBitrate:  1500,
+			Delivery:    []int{2},
+			CompanionAd: []Banner{
+				{W: 300, H: 250, ID: "1234567893-1", Pos: 1, BAttr: []int{13, 14}, ExpDir: []int{ExpDirRight, ExpDirDown}},
+				{W: 728, H: 90, ID: "1234567893-2", Pos: 1, BAttr: []int{13, 14}},
+			},
+			CompanionType: []int{1, 2},
+		}).Validate()).To(Equal(ErrInvalidAudioNoMimes))
+	})
+
+})
diff --git a/banner.go b/banner.go
index 644cf73..e4b2a03 100644
--- a/banner.go
+++ b/banner.go
@@ -7,48 +7,20 @@ package openrtb
 // 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
-	Wmax     *int       `json:"wmax,omitempty"`     // Width maximum
-	Hmax     *int       `json:"hmax,omitempty"`     // Height maximum
-	Wmin     *int       `json:"wmin,omitempty"`     // Width minimum
-	Hmin     *int       `json:"hmin,omitempty"`     // Height minimum
-	Id       *string    `json:"id,omitempty"`       // A unique identifier
-	Pos      *int       `json:"pos,omitempty"`      // Ad Position
-	Btype    []int      `json:"btype,omitempty"`    // Blocked creative types
-	Battr    []int      `json:"battr,omitempty"`    // Blocked creative attributes
-	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
-	Ext      Extensions `json:"ext,omitempty"`
-}
-
-// Returns topframe status, with default fallback
-func (b *Banner) IsTopFrame() bool {
-	if b.Topframe != nil {
-		return *b.Topframe == 1
-	}
-	return false
-}
-
-// Returns the position, with default fallback
-func (b *Banner) Position() int {
-	if b.Pos != nil {
-		return *b.Pos
-	}
-	return AD_POS_UNKNOWN
-}
-
-// Applies defaults
-func (b *Banner) WithDefaults() *Banner {
-	if b.Topframe == nil {
-		b.Topframe = new(int)
-		*b.Topframe = 0
-	}
-	if b.Pos == nil {
-		b.Pos = new(int)
-		*b.Pos = AD_POS_UNKNOWN
-	}
-	return b
+	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
+	Ext      Extension `json:"ext,omitempty"`
 }
diff --git a/banner_test.go b/banner_test.go
index 66a68b0..a8f8787 100644
--- a/banner_test.go
+++ b/banner_test.go
@@ -9,17 +9,19 @@ var _ = Describe("Banner", func() {
 	var subject *Banner
 
 	BeforeEach(func() {
-		subject = new(Banner)
+		err := fixture("banner", &subject)
+		Expect(err).NotTo(HaveOccurred())
 	})
 
-	It("should have accessors", func() {
-		Expect(subject.IsTopFrame()).To(BeFalse())
-		Expect(subject.Position()).To(Equal(0))
+	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},
+		}))
 	})
 
-	It("should have defaults", func() {
-		subject.WithDefaults()
-		Expect(*subject.Topframe).To(Equal(0))
-		Expect(*subject.Pos).To(Equal(AD_POS_UNKNOWN))
-	})
 })
diff --git a/bench_test.go b/bench_test.go
new file mode 100644
index 0000000..c90b2dd
--- /dev/null
+++ b/bench_test.go
@@ -0,0 +1,42 @@
+package openrtb
+
+import (
+	"encoding/json"
+	"io/ioutil"
+	"path/filepath"
+	"testing"
+)
+
+func BenchmarkBidRequest_Unmarshal(b *testing.B) {
+	data, err := ioutil.ReadFile(filepath.Join("testdata", "breq.video.json"))
+	if err != nil {
+		b.Fatal(err.Error())
+	}
+
+	b.ResetTimer()
+	for i := 0; i < b.N; i++ {
+		var req *BidRequest
+		if err := json.Unmarshal(data, &req); err != nil {
+			b.Fatal(err.Error())
+		}
+	}
+}
+
+func BenchmarkBidRequest_Marshal(b *testing.B) {
+	data, err := ioutil.ReadFile(filepath.Join("testdata", "breq.video.json"))
+	if err != nil {
+		b.Fatal(err.Error())
+	}
+
+	var req *BidRequest
+	if err := json.Unmarshal(data, &req); err != nil {
+		b.Fatal(err.Error())
+	}
+
+	b.ResetTimer()
+	for i := 0; i < b.N; i++ {
+		if _, err := json.Marshal(req); err != nil {
+			b.Fatal(err.Error())
+		}
+	}
+}
diff --git a/bid.go b/bid.go
index b21c007..e9a7226 100644
--- a/bid.go
+++ b/bid.go
@@ -1,10 +1,14 @@
 package openrtb
 
-import (
-	"errors"
+import "errors"
+
+// Validation errors
+var (
+	ErrInvalidBidNoID    = errors.New("openrtb: bid is missing ID")
+	ErrInvalidBidNoImpID = errors.New("openrtb: bid is missing impression ID")
 )
 
-// ID, Impid and Price are required; all other optional.
+// 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;
 // b) to convey certain information using substitution macros.
@@ -12,65 +16,36 @@ import (
 // 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   *float32   `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.
-	Adm     *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.
-	Adomain []string   `json:"adomain,omitempty"` // Advertiser’s primary or top-level domain for advertiser checking; or multiple if imp rotating.
-	Iurl    *string    `json:"iurl,omitempty"`    // Sample image URL.
-	Cid     *string    `json:"cid,omitempty"`     // Campaign ID that appears with the Ad markup.
-	Crid    *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.
-	Attr    []int      `json:"attr,omitempty"`    // Array of creative attributes.
-	DealId  *string    `json:"deal_id,omitempty"` // DealID extension of private marketplace deals
-	Ext     Extensions `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.
+	NURL           string    `json:"nurl,omitempty"`           // Win 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     string    `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.
+	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.
+	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.
+	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            Extension `json:"ext,omitempty"`
 }
 
-// Validation errors
-var (
-	ErrInvalidBidID    = errors.New("openrtb response: bid is missing ID")
-	ErrInvalidBidImpID = errors.New("openrtb response: bid is missing impression ID")
-	ErrInvalidBidPrice = errors.New("openrtb response: bid is missing price")
-)
-
-// Validate Bid required attributes
-func (bid *Bid) Valid() (bool, error) {
-
-	if bid.Id == nil {
-		return false, ErrInvalidBidID
-	} else if bid.Impid == nil {
-		return false, ErrInvalidBidImpID
-	} else if bid.Price == nil {
-		return false, ErrInvalidBidPrice
+// Validate required attributes
+func (bid *Bid) Validate() error {
+	if bid.ID == "" {
+		return ErrInvalidBidNoID
+	} else if bid.ImpID == "" {
+		return ErrInvalidBidNoImpID
 	}
 
-	return true, nil
-}
-
-// Set the ID
-func (bid *Bid) SetID(id string) *Bid {
-	if bid.Id == nil {
-		bid.Id = new(string)
-	}
-	*bid.Id = id
-	return bid
-}
-
-// Set the ImpID
-func (bid *Bid) SetImpID(id string) *Bid {
-	if bid.Impid == nil {
-		bid.Impid = new(string)
-	}
-	*bid.Impid = id
-	return bid
-}
-
-// Set the Price
-func (bid *Bid) SetPrice(p float32) *Bid {
-	if bid.Price == nil {
-		bid.Price = new(float32)
-	}
-	*bid.Price = p
-	return bid
+	return nil
 }
diff --git a/bid_test.go b/bid_test.go
index 4173baa..369d2bd 100644
--- a/bid_test.go
+++ b/bid_test.go
@@ -9,21 +9,31 @@ var _ = Describe("Bid", func() {
 	var subject *Bid
 
 	BeforeEach(func() {
-		subject = new(Bid)
+		err := fixture("bid", &subject)
+		Expect(err).NotTo(HaveOccurred())
 	})
 
-	It("should have validation", func() {
-		ok, err := subject.Valid()
-		Expect(err).To(HaveOccurred())
-		Expect(ok).To(BeFalse())
-
-		subject.SetID("BIDID")
-		subject.SetImpID("IMPID")
-		subject.SetPrice(0.0)
+	It("should parse correctly", func() {
+		Expect(subject).To(Equal(&Bid{
+			ID:         "1",
+			ImpID:      "1",
+			Price:      0.751371,
+			AdID:       "52a5516d29e435137c6f6e74",
+			NURL:       "http://ads.com/win/112770_1386565997?won=${AUCTION_PRICE}",
+			AdMarkup:   "<html/>",
+			AdvDomain:  []string{"ads.com"},
+			IURL:       "http://ads.com/112770_1386565997.jpeg",
+			CampaignID: "52a5516d29e435137c6f6e74",
+			CreativeID: "52a5516d29e435137c6f6e74_1386565997",
+			DealID:     "example_deal",
+			Attr:       []int{},
+		}))
+	})
 
-		ok, err = subject.Valid()
-		Expect(err).NotTo(HaveOccurred())
-		Expect(ok).To(BeTrue())
+	It("should validate", func() {
+		Expect((&Bid{}).Validate()).To(Equal(ErrInvalidBidNoID))
+		Expect((&Bid{ID: "BIDID"}).Validate()).To(Equal(ErrInvalidBidNoImpID))
+		Expect(subject.Validate()).NotTo(HaveOccurred())
 	})
 
 })
diff --git a/bidrequest.go b/bidrequest.go
new file mode 100644
index 0000000..46e1c8b
--- /dev/null
+++ b/bidrequest.go
@@ -0,0 +1,54 @@
+package openrtb
+
+import "errors"
+
+// Validation errors
+var (
+	ErrInvalidReqNoID     = errors.New("openrtb: request ID missing")
+	ErrInvalidReqNoImps   = errors.New("openrtb: request has no impressions")
+	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"
+// 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
+	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.
+	Regs        *Regulations `json:"regs,omitempty"`
+	Ext         Extension    `json:"ext,omitempty"`
+
+	Pmp *Pmp `json:"pmp,omitempty"` // DEPRECATED: kept for backwards compatibility
+}
+
+// Validates the request
+func (req *BidRequest) Validate() error {
+	if req.ID == "" {
+		return ErrInvalidReqNoID
+	} else if len(req.Imp) == 0 {
+		return ErrInvalidReqNoImps
+	} else if req.Site != nil && req.App != nil {
+		return ErrInvalidReqMultiInv
+	}
+
+	for _, imp := range req.Imp {
+		if err := (&imp).Validate(); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
diff --git a/bidrequest_test.go b/bidrequest_test.go
new file mode 100644
index 0000000..fae9988
--- /dev/null
+++ b/bidrequest_test.go
@@ -0,0 +1,79 @@
+package openrtb
+
+import (
+	"encoding/json"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("BidRequest", func() {
+	var subject *BidRequest
+
+	BeforeEach(func() {
+		err := fixture("breq.banner", &subject)
+		Expect(err).NotTo(HaveOccurred())
+	})
+
+	It("should parse complex requests", func() {
+		for _, kind := range []string{"exp", "video", "native"} {
+			var req *BidRequest
+			err := fixture("breq."+kind, &req)
+			Expect(err).NotTo(HaveOccurred(), "for %s", kind)
+			Expect(req.Validate()).NotTo(HaveOccurred(), "for %s", kind)
+		}
+	})
+
+	It("should parse correctly", func() {
+		Expect(subject).To(Equal(&BidRequest{
+			ID: "1234534625254",
+			Imp: []Impression{
+				{
+					ID:     "1",
+					Secure: json.Number("1"),
+					Banner: &Banner{W: 300, H: 250, Pos: AdPosAboveFold, BAttr: []int{13}},
+				},
+			},
+			Site: &Site{
+				Inventory: Inventory{
+					ID:        "234563",
+					Name:      "Site ABCD",
+					Domain:    "siteabcd.com",
+					Cat:       []string{"IAB2-1", "IAB2-2"},
+					Publisher: &Publisher{ID: "pub12345", Name: "Publisher A"},
+					Content: &Content{
+						Keywords: "keyword a,keyword b,keyword c",
+					},
+				},
+				Page: "http://siteabcd.com/page.htm",
+				Ref:  "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",
+			},
+			User: &User{
+				ID:       "45asdf987656789adfad4678rew656789",
+				BuyerUID: "5df678asd8987656asdf78987654",
+			},
+			Test:        1,
+			AuctionType: 2,
+			TMax:        120,
+			BAdv:        []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", 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(subject.Validate()).NotTo(HaveOccurred())
+	})
+
+})
diff --git a/bidresponse.go b/bidresponse.go
new file mode 100644
index 0000000..a759e2a
--- /dev/null
+++ b/bidresponse.go
@@ -0,0 +1,40 @@
+package openrtb
+
+import "errors"
+
+// Validation errors
+var (
+	ErrInvalidRespNoID       = errors.New("openrtb: response missing ID")
+	ErrInvalidRespNoSeatBids = errors.New("openrtb: response missing seatbids")
+)
+
+// 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
+	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
+	Ext        Extension `json:"ext,omitempty"`        // Custom specifications in JSon
+}
+
+// Validate required attributes
+func (res *BidResponse) Validate() error {
+	if res.ID == "" {
+		return ErrInvalidRespNoID
+	} else if len(res.SeatBid) == 0 {
+		return ErrInvalidRespNoSeatBids
+	}
+
+	for _, sb := range res.SeatBid {
+		if err := sb.Validate(); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
diff --git a/bidresponse_test.go b/bidresponse_test.go
new file mode 100644
index 0000000..8f81f17
--- /dev/null
+++ b/bidresponse_test.go
@@ -0,0 +1,57 @@
+package openrtb
+
+import (
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("BidResponse", func() {
+	var subject *BidResponse
+
+	BeforeEach(func() {
+		err := fixture("bres.single", &subject)
+		Expect(err).NotTo(HaveOccurred())
+	})
+
+	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(req.Validate()).NotTo(HaveOccurred(), "for %s", kind)
+		}
+	})
+
+	It("should parse responses", func() {
+		Expect(subject).To(Equal(&BidResponse{
+			ID: "BID-4-ZIMP-4b309eae-504a-4252-a8a8-4c8ceee9791a",
+			SeatBid: []SeatBid{
+				{
+					Bid: []Bid{
+						{
+							ID:         "32a69c6ba388f110487f9d1e63f77b22d86e916b",
+							ImpID:      "32a69c6ba388f110487f9d1e63f77b22d86e916b",
+							Price:      0.065445,
+							AdID:       "529833ce55314b19e8796116",
+							NURL:       "http://ads.com/win/529833ce55314b19e8796116?won=${auction_price}",
+							AdMarkup:   "<iframe src=\"foo.bar\"/>",
+							AdvDomain:  []string{},
+							CampaignID: "529833ce55314b19e8796116",
+							CreativeID: "529833ce55314b19e8796116_1385706446",
+							Attr:       []int{},
+						},
+					},
+					Seat: "772",
+				},
+			},
+			Currency: "USD",
+		}))
+	})
+
+	It("should validate", func() {
+		Expect((&BidResponse{}).Validate()).To(Equal(ErrInvalidRespNoID))
+		Expect((&BidResponse{ID: "RESPID"}).Validate()).To(Equal(ErrInvalidRespNoSeatBids))
+		Expect(subject.Validate()).NotTo(HaveOccurred())
+	})
+
+})
diff --git a/content.go b/content.go
new file mode 100644
index 0000000..e8ae2ac
--- /dev/null
+++ b/content.go
@@ -0,0 +1,35 @@
+package openrtb
+
+// This 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,omiyempty"`              // 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            int       `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                Extension `json:"ext,omitempty"`
+}
diff --git a/content_test.go b/content_test.go
new file mode 100644
index 0000000..08e035d
--- /dev/null
+++ b/content_test.go
@@ -0,0 +1,28 @@
+package openrtb
+
+import (
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("Content", func() {
+	var subject *Content
+
+	BeforeEach(func() {
+		err := fixture("content", &subject)
+		Expect(err).NotTo(HaveOccurred())
+	})
+
+	It("should parse correctly", func() {
+		Expect(subject).To(Equal(&Content{
+			ID:    "1",
+			Title: "Video",
+			Producer: &Producer{
+				ID:     "agltb3B1Yi1pbmNyDAsSA0FwcBiJkfTUCV",
+				Name:   "yahoo",
+				Domain: "www.yahoo.com",
+			},
+		}))
+	})
+
+})
diff --git a/device.go b/device.go
index 3827b79..ab17104 100644
--- a/device.go
+++ b/device.go
@@ -4,80 +4,34 @@ package openrtb
 // 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 {
-	Dnt            *int       `json:"dnt,omitempty"` // "1": Do not track
-	Ua             *string    `json:"ua,omitempty"`  // User agent
-	Ip             *string    `json:"ip,omitempty"`  // IPv4
-	Geo            *Geo       `json:"geo,omitempty"`
-	Didsha1        *string    `json:"didsha1,omitempty"`  // SHA1 hashed device ID
-	Didmd5         *string    `json:"didmd5,omitempty"`   // MD5 hashed device ID
-	Dpidsha1       *string    `json:"dpidsha1,omitempty"` // SHA1 hashed platform device ID
-	Dpidmd5        *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
-	Ipv6           *string    `json:"ipv6,omitempty"`     // IPv6
-	Carrier        *string    `json:"carrier,omitempty"`  // Carrier or ISP derived from the IP address
-	Language       *string    `json:"language,omitempty"` // Browser language
-	Make           *string    `json:"make,omitempty"`     // Device make
-	Model          *string    `json:"model,omitempty"`    // Device model
-	Os             *string    `json:"os,omitempty"`       // Device OS
-	Osv            *string    `json:"osv,omitempty"`      // Device OS version
-	Js             *int       `json:"js,omitempty"`       // Javascript status ("0": Disabled, "1": Enabled)
-	Connectiontype *int       `json:"connectiontype,omitempty"`
-	Devicetype     *int       `json:"devicetype,omitempty"`
-	Flashver       *string    `json:"flashver,omitempty"` // Flash version
-	Ifa            *string    `json:"ifa,omitempty"`      // Native identifier for advertisers
-	Ext            Extensions `json:"ext,omitempty"`
-}
-
-// Returns the DNT status, with default fallback
-func (d *Device) IsDnt() bool {
-	if d.Dnt != nil {
-		return *d.Dnt == 1
-	}
-	return false
-}
-
-// Returns the JS status, with default fallback
-func (d *Device) IsJs() bool {
-	if d.Js != nil {
-		return *d.Js == 1
-	}
-	return false
-}
-
-// Returns the connection type, with default fallback
-func (d *Device) ConnectionType() int {
-	if d.Connectiontype != nil {
-		return *d.Connectiontype
-	}
-	return CONN_TYPE_UNKNOWN
-}
-
-// Returns the connection type, with default fallback
-func (d *Device) DeviceType() int {
-	if d.Devicetype != nil {
-		return *d.Devicetype
-	}
-	return DEVICE_TYPE_UNKNOWN
-}
-
-// Applies defaults
-func (d *Device) WithDefaults() *Device {
-	if d.Dnt == nil {
-		d.Dnt = new(int)
-		*d.Dnt = 0
-	}
-	if d.Js == nil {
-		d.Js = new(int)
-		*d.Js = 0
-	}
-	if d.Connectiontype == nil {
-		d.Connectiontype = new(int)
-		*d.Connectiontype = CONN_TYPE_UNKNOWN
-	}
-	if d.Devicetype == nil {
-		d.Devicetype = new(int)
-		*d.Devicetype = DEVICE_TYPE_UNKNOWN
-	}
-	return d
+	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
+	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        Extension `json:"ext,omitempty"`
 }
diff --git a/device_test.go b/device_test.go
index dc243ba..9cf52b5 100644
--- a/device_test.go
+++ b/device_test.go
@@ -9,21 +9,35 @@ var _ = Describe("Device", func() {
 	var subject *Device
 
 	BeforeEach(func() {
-		subject = new(Device)
+		err := fixture("device", &subject)
+		Expect(err).NotTo(HaveOccurred())
 	})
 
-	It("should have accessors", func() {
-		Expect(subject.IsDnt()).To(BeFalse())
-		Expect(subject.IsJs()).To(BeFalse())
-		Expect(subject.ConnectionType()).To(Equal(0))
-		Expect(subject.DeviceType()).To(Equal(0))
-	})
-
-	It("should have defaults", func() {
-		subject.WithDefaults()
-		Expect(*subject.Dnt).To(Equal(0))
-		Expect(*subject.Js).To(Equal(0))
-		Expect(*subject.Connectiontype).To(Equal(CONN_TYPE_UNKNOWN))
-		Expect(*subject.Connectiontype).To(Equal(DEVICE_TYPE_UNKNOWN))
+	It("should parse correctly", func() {
+		Expect(subject).To(Equal(&Device{
+			DNT: 0,
+			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",
+			},
+			PIDSHA1:    "AA000DFE74168477C70D291f574D344790E0BB11",
+			PIDMD5:     "AA003EABFB29E6F759F3BDAB34E50BB11",
+			Carrier:    "310-410",
+			Language:   "en",
+			Make:       "Apple",
+			Model:      "iPhone",
+			OS:         "iOS",
+			OSVer:      "6.1",
+			JS:         1,
+			ConnType:   3,
+			DeviceType: 1,
+		}))
 	})
 })
diff --git a/doc.go b/doc.go
index 6d84497..de7b323 100644
--- a/doc.go
+++ b/doc.go
@@ -1,59 +1,5 @@
-// Copyright (c) 2013 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.
-
 /*
 This package implements a parser (with optional validation) and a generator for
-OpenRTB 2.1 requests and responses.
-
-Spec
-
-http://www.iab.net/media/file/OpenRTB-API-Specification-Version-2-1-FINAL.pdf
-
-Usage
-
-  // Handle a HTTP request
-  http.HandleFunc("/bid", func(w http.ResponseWriter, r *http.Request) {
-    defer r.Body().Close()
-
-    req, err := openrtb.ParseRequest(r.Body(), true)
-    if err != nil {
-      log.Println("ERROR %s", err.Error())
-    } else {
-      log.Println("INFO  Received bid request %s", *req.Id)
-    }
-
-    w.WriteHeader(204) // respond with 'no bid'
-  })
-
-Implemented
-
-- Request parsing
-- Most objects
-- PMP additions
-
-Todo
-
-- Response parsing
-- Generating request and responses
-- Content objects
+OpenRTB 2.x requests and responses.
 */
 package openrtb
diff --git a/extension.go b/extension.go
new file mode 100644
index 0000000..df82b29
--- /dev/null
+++ b/extension.go
@@ -0,0 +1,23 @@
+package openrtb
+
+import "errors"
+
+// Extension is a raw encoded JSON value.
+// It implements Marshaler and Unmarshaler, defined in encoding/json package,
+// works similarly to Extension,
+// but does not need to be used as pointer for proper JSON marshaling.
+type Extension []byte
+
+// MarshalJSON returns e as the JSON encoding of e.
+func (e Extension) MarshalJSON() ([]byte, error) {
+	return e, nil
+}
+
+// UnmarshalJSON sets *e to a copy of data.
+func (e *Extension) UnmarshalJSON(data []byte) error {
+	if e == nil {
+		return errors.New("openrtb.Extension: UnmarshalJSON on nil pointer")
+	}
+	*e = append((*e)[0:0], data...)
+	return nil
+}
diff --git a/extension_test.go b/extension_test.go
new file mode 100644
index 0000000..7a16c84
--- /dev/null
+++ b/extension_test.go
@@ -0,0 +1,29 @@
+package openrtb
+
+import (
+	"encoding/json"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("Extension", func() {
+	var _ json.Marshaler = (Extension)(nil)
+	var _ json.Unmarshaler = (*Extension)(nil)
+
+	It("should marshal JSON", func() {
+		subject := Extension(`{"foo":"bar"}`)
+
+		b, err := json.Marshal(subject)
+		Expect(err).NotTo(HaveOccurred())
+		Expect(b).To(Equal([]byte(`{"foo":"bar"}`)))
+	})
+
+	It("should unmarshal JSON", func() {
+		subject := Extension([]byte{})
+
+		err := json.Unmarshal([]byte(`{"foo":"bar"}`), &subject)
+		Expect(err).NotTo(HaveOccurred())
+		Expect(subject).To(Equal(Extension(`{"foo":"bar"}`)))
+	})
+})
diff --git a/fixtures_test.go b/fixtures_test.go
deleted file mode 100644
index e5a4a1a..0000000
--- a/fixtures_test.go
+++ /dev/null
@@ -1,163 +0,0 @@
-package openrtb
-
-var testFixtures = struct {
-	simpleBanner       []byte
-	expandableCreative []byte
-	simpleResponse     []byte
-}{
-	simpleBanner: []byte(`
-{
-  "id":"1234534625254",
-  "at":2,
-  "tmax":120,
-  "imp":[
-    {
-      "id":"1",
-      "banner":{
-        "w":300,
-        "h":250,
-        "pos":1,
-        "battr":[13]
-      }
-    }
-  ],
-  "badv":["company1.com","company2.com"],
-  "site":{
-    "id":"234563",
-    "name":"Site ABCD",
-    "domain":"siteabcd.com",
-    "cat":["IAB2-1", "IAB2-2"],
-    "privacypolicy":1,
-    "page":"http://siteabcd.com/page.htm",
-    "ref":"http://referringsite.com/referringpage.htm",
-    "publisher":{
-      "id":"pub12345",
-      "name":"Publisher A"
-    },
-    "content":{
-      "keywords":["keyword a","keyword b","keyword c"]
-    }
-  },
-  "device":{
-    "ip":"64.124.253.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",
-    "os":"OS X",
-    "flashver":"10.1",
-    "js":1
-  },
-  "user":{
-    "id":"45asdf987656789adfad4678rew656789",
-    "buyeruid":"5df678asd8987656asdf78987654"
-  }
-}
-`),
-	expandableCreative: []byte(`
-{
-  "id":"1234567893",
-  "at":2,
-  "tmax":120,
-  "imp":[
-    {
-      "id":"1",
-      "iframebuster":[
-        "vendor1.com",
-        "vendor2.com"
-      ],
-      "banner":{
-        "w":300,
-        "h":250,
-        "wmin":300,
-        "hmin":250,
-        "pos":1,
-        "battr":[
-          13
-        ],
-        "expdir":[
-          2,
-          4
-        ]
-      }
-    }
-  ],
-  "site":{
-    "id":"1345135123",
-    "name":"Site ABCD",
-    "domain":"siteabcd.com",
-    "sitecat":[
-      "IAB2-1",
-      "IAB2-2"
-    ],
-    "page":"http://siteabcd.com/page.htm",
-    "ref":"http://referringsite.com/referringpage.htm",
-    "privacypolicy":1,
-    "publisher":{
-      "id":"pub12345",
-      "name":"Publisher A"
-    },
-    "content":{
-      "keyword":[
-        "keyword1",
-        "keyword2",
-        "keyword3"
-      ]
-    }
-  },
-  "device":{
-    "ip":"64.124.253.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",
-    "os":"OS X",
-    "flashver":"10.1",
-    "js":1
-  },
-  "user":{
-    "id":"456789876567897654678987656789",
-    "buyeruid":"545678765467876567898765678987654",
-    "data":[
-      {
-        "id":"6",
-        "name":"Data Provider 1",
-        "segment":[
-          {
-            "id":"12341318394918",
-            "name":"auto intenders"
-          },
-          {
-            "id":"1234131839491234",
-            "name":"auto enthusiasts"
-          },
-          {
-            "id":"23423424",
-            "name":"data-provider1-age",
-            "value":"30-40"
-          }
-        ]
-      }
-    ]
-  }
-}`),
-	simpleResponse: []byte(`
-{
-    "id": "BID-4-ZIMP-4b309eae-504a-4252-a8a8-4c8ceee9791a",
-    "seatbid": [
-        {
-            "bid": [
-                {
-                    "id": "32a69c6ba388f110487f9d1e63f77b22d86e916b",
-                    "impid": "32a69c6ba388f110487f9d1e63f77b22d86e916b",
-                    "price": 0.065445,
-                    "adid": "529833ce55314b19e8796116",
-                    "nurl": "http://ads.com/win/529833ce55314b19e8796116?won=${auction_price}",
-                    "adm": "<iframe src=\"foo.bar\"/>" ,
-                    "adomain": [],
-                    "cid": "529833ce55314b19e8796116",
-                    "crid": "529833ce55314b19e8796116_1385706446",
-                    "attr": []
-                }
-            ],
-            "seat": "772"
-        }
-    ],
-    "cur": "USD"
-}
-`),
-}
diff --git a/impression.go b/impression.go
index 8486470..a3e8b55 100644
--- a/impression.go
+++ b/impression.go
@@ -1,113 +1,71 @@
 package openrtb
 
 import (
+	"encoding/json"
 	"errors"
 )
 
+// Validation errors
+var (
+	ErrInvalidImpNoID        = errors.New("openrtb: impression ID missing")
+	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
 // 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
 // restricting involvement to specific subsets of seats within bidders.
+// 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"`
-	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          *float32   `json:"bidfloor,omitempty"`          // Bid floor for this impression in CPM
-	Bidfloorcur       *string    `json:"bidfloorcur,omitempty"`       // Currency of bid floor
-	Secure            *int       `json:"secure,omitempty"`            // Flag to indicate whether the impression requires secure HTTPS URL creative assets and markup.
-	Iframebuster      []string   `json:"iframebuster,omitempty"`      // Array of names for supportediframe busters.
-	Pmp               *Pmp       `json:"pmp,omitempty"`               // A reference to the PMP object containing any Deals eligible for the impression object.
-	Ext               Extensions `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
+	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            json.Number `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               Extension   `json:"ext,omitempty"`
 }
 
-// Validation errors
-var (
-	ErrInvalidImpID  = errors.New("openrtb parse: impression ID missing")
-	ErrInvalidImpBoV = errors.New("openrtb parse: impression has neither a banner nor video")
-	ErrInvalidImpBaV = errors.New("openrtb parse: impression has banner and video")
-)
-
-// Validates the `imp` object
-func (imp *Impression) Valid() (bool, error) {
-
-	if imp.Id == nil {
-		return false, ErrInvalidImpID
-	} else if imp.Banner != nil && imp.Video != nil {
-		return false, ErrInvalidImpBaV
-	} else if imp.Video != nil {
-		if ok, err := imp.Video.Valid(); !ok {
-			return ok, err
-		}
-	} else if imp.Banner == nil {
-		return false, ErrInvalidImpBoV
-	}
-
-	return true, nil
-}
-
-// Returns secure status, with default fallback
-func (imp *Impression) IsSecure() bool {
-	if imp.Secure != nil {
-		return *imp.Secure == 1
-	}
-	return false
-}
-
-// Returns the `imp` object returning defaults
-func (imp *Impression) WithDefaults() *Impression {
-	if imp.Instl == nil {
-		imp.Instl = new(int)
-		*imp.Instl = 0
+func (imp *Impression) assetCount() int {
+	n := 0
+	if imp.Banner != nil {
+		n++
 	}
-
-	if imp.Bidfloor == nil {
-		imp.Bidfloor = new(float32)
-		*imp.Bidfloor = 0
+	if imp.Video != nil {
+		n++
 	}
-
-	if imp.Secure == nil {
-		imp.Secure = new(int)
-		*imp.Secure = 0
+	if imp.Native != nil {
+		n++
 	}
+	return n
+}
 
-	if imp.Bidfloorcur == nil {
-		imp.Bidfloorcur = new(string)
-		*imp.Bidfloorcur = "USD"
+// Validates the `imp` object
+func (imp *Impression) Validate() error {
+	if imp.ID == "" {
+		return ErrInvalidImpNoID
 	}
 
-	if imp.Banner != nil {
-		imp.Banner.WithDefaults()
+	if count := imp.assetCount(); count > 1 {
+		return ErrInvalidImpMultiAssets
 	}
 
 	if imp.Video != nil {
-		imp.Video.WithDefaults()
-	}
-
-	return imp
-}
-
-// Set the ID
-func (imp *Impression) SetId(id string) *Impression {
-	if imp.Id == nil {
-		imp.Id = new(string)
+		if err := imp.Video.Validate(); err != nil {
+			return err
+		}
 	}
-	*imp.Id = id
-	return imp
-}
-
-// Set the Banner
-func (imp *Impression) SetBanner(b *Banner) *Impression {
-	imp.Banner = b
-	return imp
-}
 
-// Set the Video
-func (imp *Impression) SetVideo(v *Video) *Impression {
-	imp.Video = v
-	return imp
+	return nil
 }
diff --git a/impression_test.go b/impression_test.go
index 1025b7b..93777ff 100644
--- a/impression_test.go
+++ b/impression_test.go
@@ -9,50 +9,35 @@ var _ = Describe("Impression", func() {
 	var subject *Impression
 
 	BeforeEach(func() {
-		subject = new(Impression)
-	})
-
-	It("should validate", func() {
-		b := &Banner{}
-		v := (&Video{Mimes: []string{"MIME_123"}}).SetLinearity(1).SetMinduration(1).SetMaxduration(5).SetProtocol(1)
-
-		ok, err := subject.Valid()
-		Expect(err).To(HaveOccurred())
-		Expect(ok).To(BeFalse())
-
-		subject.SetId("CODE_12")
-		subject.SetBanner(b)
-		ok, err = subject.Valid()
+		err := fixture("impression", &subject)
 		Expect(err).NotTo(HaveOccurred())
-		Expect(ok).To(BeTrue())
-
-		subject.SetVideo(v)
-		ok, err = subject.Valid()
-		Expect(err).To(HaveOccurred())
-		Expect(ok).To(BeFalse())
-
-		subject.SetBanner(nil)
-		ok, err = subject.Valid()
-		Expect(err).NotTo(HaveOccurred())
-		Expect(ok).To(BeTrue())
 	})
 
-	It("should have accessors", func() {
-		Expect(subject.IsSecure()).To(BeFalse())
+	It("should parse correctly", func() {
+		Expect(subject).To(Equal(&Impression{
+			ID: "1",
+			Banner: &Banner{
+				W: 300,
+				H: 250,
+			},
+			BidFloor: 0.03,
+			Pmp: &Pmp{
+				Private: 1,
+				Deals: []Deal{
+					{
+						ID:          "DX-1985-010A",
+						BidFloor:    2.5,
+						AuctionType: 2,
+					},
+				},
+			},
+		}))
 	})
 
-	It("should have defaults", func() {
-		subject.SetBanner(&Banner{}).SetVideo(&Video{})
-		subject.WithDefaults()
-
-		Expect(*subject.Instl).To(Equal(0))
-		Expect(*subject.Secure).To(Equal(0))
-		Expect(*subject.Bidfloor).To(Equal(float32(0.0)))
-		Expect(*subject.Bidfloorcur).To(Equal("USD"))
-		Expect(*subject.Banner.Topframe).To(Equal(0))
-		Expect(*subject.Banner.Pos).To(Equal(AD_POS_UNKNOWN))
-		Expect(*subject.Video.Sequence).To(Equal(1))
-		Expect(*subject.Video.Boxingallowed).To(Equal(1))
-		Expect(*subject.Video.Pos).To(Equal(AD_POS_UNKNOWN))
+	It("should validate", func() {
+		Expect((&Impression{}).Validate()).To(Equal(ErrInvalidImpNoID))
+		Expect((&Impression{ID: "IMPID", Banner: &Banner{}, Video: &Video{}}).Validate()).To(Equal(ErrInvalidImpMultiAssets))
+		Expect((&Impression{ID: "IMPID", Banner: &Banner{}}).Validate()).NotTo(HaveOccurred())
 	})
+
 })
diff --git a/inventory.go b/inventory.go
new file mode 100644
index 0000000..7b15d47
--- /dev/null
+++ b/inventory.go
@@ -0,0 +1,44 @@
+package openrtb
+
+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:"pivacypolicy,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           Extension  `json:"ext,omitempty"`
+}
+
+// GetPrivacyPolicy returns the privacy policy value
+func (a *Inventory) GetPrivacyPolicy() int {
+	if a.PrivacyPolicy != nil {
+		return *a.PrivacyPolicy
+	}
+	return 1
+}
+
+// An "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
+	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
+// 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)
+}
diff --git a/inventory_test.go b/inventory_test.go
new file mode 100644
index 0000000..6bce843
--- /dev/null
+++ b/inventory_test.go
@@ -0,0 +1,68 @@
+package openrtb
+
+import (
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("App", func() {
+	var subject *App
+
+	BeforeEach(func() {
+		err := fixture("app", &subject)
+		Expect(err).NotTo(HaveOccurred())
+	})
+
+	It("should have accessors", func() {
+		Expect(subject.GetPrivacyPolicy()).To(Equal(1))
+	})
+
+	It("should parse correctly", func() {
+		Expect(subject).To(Equal(&App{
+			Inventory: Inventory{
+				ID:   "agltb3B1Yi1pbmNyDAsSA0FwcBiJkfIUDA",
+				Name: "Yahoo Weather",
+				Cat:  []string{"weather", "IAB15", "IAB15-10"},
+				Publisher: &Publisher{
+					ID:     "agltb3B1Yi1pbmNyDAsSA0FwcBiJkfTUCV",
+					Name:   "yahoo",
+					Domain: "www.yahoo.com",
+				},
+			},
+			Bundle:   "628677149",
+			Ver:      "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())
+	})
+
+	It("should have accessors", func() {
+		Expect(subject.GetPrivacyPolicy()).To(Equal(1))
+	})
+
+	It("should parse correctly", func() {
+		Expect(subject).To(Equal(&Site{
+			Inventory: Inventory{
+				ID:     "102855",
+				Cat:    []string{"IAB3-1"},
+				Domain: "http://www.usabarfinder.com",
+				Publisher: &Publisher{
+					ID:     "8953",
+					Name:   "local.com",
+					Domain: "local.com",
+				},
+			},
+			Page: "http://eas.usabarfinder.com/eas?cu=13824;cre=mu;target=_blank",
+		}))
+	})
+
+})
diff --git a/native.go b/native.go
new file mode 100644
index 0000000..5d75311
--- /dev/null
+++ b/native.go
@@ -0,0 +1,16 @@
+package openrtb
+
+// This 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
+// a native type impression. At the publisher’s discretion, that same impression may also be offered as
+// 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 Extension `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     Extension `json:"ext,omitempty"`
+}
diff --git a/native/request/asset.go b/native/request/asset.go
new file mode 100644
index 0000000..da514d1
--- /dev/null
+++ b/native/request/asset.go
@@ -0,0 +1,17 @@
+package request
+
+import "github.com/bsm/openrtb"
+
+// 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.
+type Asset struct {
+	ID       int               `json:"id"`                 // Unique asset ID, assigned by exchange
+	Required int               `json:"required,omitempty"` // Set to 1 if asset is required
+	Title    *Title            `json:"title,omitempty"`    // Title object for title assets
+	Image    *Image            `json:"img,omitempty"`      // Image object for image assets
+	Video    *Video            `json:"video,omitempty"`    // Video object for video assets
+	Data     *Data             `json:"data,omitempty"`     // Data object for brand name, description, ratings, prices etc.
+	Ext      openrtb.Extension `json:"ext,omitempty"`
+}
diff --git a/native/request/data.go b/native/request/data.go
new file mode 100644
index 0000000..a3723b7
--- /dev/null
+++ b/native/request/data.go
@@ -0,0 +1,27 @@
+package request
+
+import "github.com/bsm/openrtb"
+
+type DataTypeID int
+
+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
+	DataTypeRating         DataTypeID = 3  // Rating of the product being offered to the user
+	DataTypeLikes          DataTypeID = 4  // Number of social ratings or “likes” of the product being offered to the user
+	DataTypeDownloads      DataTypeID = 5  // Number downloads/installs of this product
+	DataTypePrice          DataTypeID = 6  // Price for product / app / in-app purchase. Value should include currency symbol in localised format
+	DataTypeSalePrice      DataTypeID = 7  // Sale price that can be used together with price to indicate a discounted price compared to a regular price. Value should include currency symbol in localised format
+	DataTypePhone          DataTypeID = 8  // Phone number
+	DataTypeAddress        DataTypeID = 9  // Address
+	DataTypeDescAdditional DataTypeID = 10 // Additional descriptive text associated with the product or service being advertised
+	DataTypeDisplayURL     DataTypeID = 11 // Display URL for the text ad. To be used when sponsoring entity doesn’t own the content. IE sponsored by BRAND on SITE (where SITE is transmitted in this field)
+	DataTypeCTADesc        DataTypeID = 12 // CTA description - descriptive text describing a ‘call to action’ button for the destination URL
+
+)
+
+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
+	Ext    openrtb.Extension `json:"ext,omitempty"`
+}
diff --git a/native/request/image.go b/native/request/image.go
new file mode 100644
index 0000000..5864344
--- /dev/null
+++ b/native/request/image.go
@@ -0,0 +1,24 @@
+package request
+
+import "github.com/bsm/openrtb"
+
+type ImageTypeID int
+
+const (
+	ImageTypeIcon ImageTypeID = 1 // Icon image
+	ImageTypeLogo ImageTypeID = 2 // Logo image for the brand/app
+	ImageTypeMain ImageTypeID = 3 // Large image preview for the ad
+)
+
+type Image struct {
+	TypeID ImageTypeID `json:"type,omitempty"` // Type ID of the image element supported by the publisher
+
+	Width     int `json:"w,omitempty"`    // Width of the image in pixels
+	WidthMin  int `json:"wmin,omitempty"` // The minimum requested width of the image in pixels
+	Height    int `json:"h,omitempty"`    // Height of the image in pixels
+	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
+	Ext   openrtb.Extension `json:"ext,omitempty"`
+}
diff --git a/native/request/request.go b/native/request/request.go
new file mode 100644
index 0000000..a05d896
--- /dev/null
+++ b/native/request/request.go
@@ -0,0 +1,79 @@
+package request
+
+import "github.com/bsm/openrtb"
+
+type LayoutID int
+
+const (
+	LayoutContentWall          LayoutID = 1
+	LayoutAppWall              LayoutID = 2
+	LayoutNewsFeed             LayoutID = 3
+	LayoutChatList             LayoutID = 4
+	LayoutCarousel             LayoutID = 5
+	LayoutContentStream        LayoutID = 6
+	LayoutGridAdjoiningContent LayoutID = 7
+)
+
+type AdUnitID int
+
+const (
+	AdUnitPaidSearch            AdUnitID = 1
+	AdUnitRecommendationWidget  AdUnitID = 2
+	AdUnitPromotedListings      AdUnitID = 3
+	AdUnitInAdWithNativeElement AdUnitID = 4
+	AdUnitCustom                AdUnitID = 5
+)
+
+type ContextTypeID int
+
+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
+)
+
+type PlacementTypeID int
+
+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
+	PlacementTypeOutside        PlacementTypeID = 3 // Outside the core content - for example in the ads section on the right rail, as a banner-style placement near the content, etc.
+	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
+// 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
+// a native type impression. At the publisher’s discretion, that same impression may also be offered as
+// 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              openrtb.Extension `json:"ext,omitempty"`
+}
diff --git a/native/request/request_test.go b/native/request/request_test.go
new file mode 100644
index 0000000..8de9e5c
--- /dev/null
+++ b/native/request/request_test.go
@@ -0,0 +1,44 @@
+package request
+
+import (
+	"encoding/json"
+	"io/ioutil"
+	"testing"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("Request", func() {
+	It("should parse correctly", func() {
+		req := fixture("testdata/request1.json")
+		Expect(req).To(Equal(&Request{
+			Ver:              "1.1",
+			ContextTypeID:    ContextTypeSocial,
+			ContextSubTypeID: ContextSubTypeSocial,
+			PlacementTypeID:  PlacementTypeID(11),
+			PlacementCount:   1,
+			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: 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{2, 3}, Mimes: []string{"video/mp4"}}},
+			},
+		}))
+	})
+})
+
+func TestSuite(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "openrtb/native/request")
+}
+
+func fixture(path string) *Request {
+	var subject Request
+	enc, err := ioutil.ReadFile(path)
+	Expect(err).ToNot(HaveOccurred())
+	Expect(json.Unmarshal(enc, &subject)).To(Succeed())
+	return &subject
+}
diff --git a/native/request/testdata/request1.json b/native/request/testdata/request1.json
new file mode 100644
index 0000000..24e7675
--- /dev/null
+++ b/native/request/testdata/request1.json
@@ -0,0 +1,55 @@
+{
+  "ver": "1.1",
+  "context": 2,
+  "contextsubtype": 20,
+  "plcmttype": 11,
+  "plcmtcnt": 1,
+  "seq": 2,
+  "assets": [
+    {
+      "id": 123,
+      "required": 1,
+      "title": {
+        "len": 140
+      }
+    },
+    {
+      "id": 128,
+      "required": 0,
+      "img": {
+        "w": 1000,
+        "h": 800,
+        "mimes": ["image/jpg"],
+        "wmin": 836,
+        "hmin": 627,
+        "type": 3
+      }
+    },
+    {
+      "id": 126,
+      "required": 1,
+      "data": {
+        "type": 1,
+        "len": 25
+      }
+    },
+    {
+      "id": 127,
+      "required": 1,
+      "data": {
+        "type": 2,
+        "len": 140
+      }
+    },
+    {
+      "id": 4,
+      "video": {
+        "linearity": 1,
+        "minduration": 15,
+        "maxduration": 30,
+        "protocols": [2, 3],
+        "mimes": ["video/mp4"]
+      }
+    }
+  ]
+}
diff --git a/native/request/title.go b/native/request/title.go
new file mode 100644
index 0000000..b3bf1b9
--- /dev/null
+++ b/native/request/title.go
@@ -0,0 +1,8 @@
+package request
+
+import "github.com/bsm/openrtb"
+
+type Title struct {
+	Length int               `json:"len"` // Maximum length of the text in the title element
+	Ext    openrtb.Extension `json:"ext,omitempty"`
+}
diff --git a/native/request/video.go b/native/request/video.go
new file mode 100644
index 0000000..cc9a5cb
--- /dev/null
+++ b/native/request/video.go
@@ -0,0 +1,12 @@
+package request
+
+import "github.com/bsm/openrtb"
+
+// TODO unclear if its the same as imp.video https://github.com/openrtb/OpenRTB/issues/26
+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         openrtb.Extension `json:"ext,omitempty"`
+}
diff --git a/native/response/asset.go b/native/response/asset.go
new file mode 100644
index 0000000..c657ddc
--- /dev/null
+++ b/native/response/asset.go
@@ -0,0 +1,20 @@
+package response
+
+import "github.com/bsm/openrtb"
+
+// 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
+// should be null/absent. The id is to be unique within the AssetObject array so
+// that the response can be aligned.
+type Asset struct {
+	ID       int               `json:"id"`                 // Unique asset ID, assigned by exchange, must match one of the asset IDs in request
+	Required int               `json:"required,omitempty"` // Set to 1 if asset is required
+	Title    *Title            `json:"title,omitempty"`    // Title object for title assets
+	Image    *Image            `json:"img,omitempty"`      // Image object for image assets
+	Video    *Video            `json:"video,omitempty"`    // Video object for video assets
+	Data     *Data             `json:"data,omitempty"`     // Data object for brand name, description, ratings, prices etc.
+	Link     *Link             `json:"link,omitempty"`     // Link object for call to actions. The link object applies if the asset item is activated (clicked)
+	Ext      openrtb.Extension `json:"ext,omitempty"`
+}
diff --git a/native/response/data.go b/native/response/data.go
new file mode 100644
index 0000000..e8af8aa
--- /dev/null
+++ b/native/response/data.go
@@ -0,0 +1,9 @@
+package response
+
+import "github.com/bsm/openrtb"
+
+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”
+	Ext   openrtb.Extension `json:"ext,omitempty"`
+}
diff --git a/native/response/image.go b/native/response/image.go
new file mode 100644
index 0000000..3e937bc
--- /dev/null
+++ b/native/response/image.go
@@ -0,0 +1,10 @@
+package response
+
+import "github.com/bsm/openrtb"
+
+type Image struct {
+	URL    string            `json:"url,omitempty"` // URL of the image asset
+	Width  int               `json:"w,omitempty"`   // Width of the image in pixels
+	Height int               `json:"h,omitempty"`   // Height of the image in pixels
+	Ext    openrtb.Extension `json:"ext,omitempty"`
+}
diff --git a/native/response/link.go b/native/response/link.go
new file mode 100644
index 0000000..3be381d
--- /dev/null
+++ b/native/response/link.go
@@ -0,0 +1,10 @@
+package response
+
+import "github.com/bsm/openrtb"
+
+type Link struct {
+	URL           string            `json:"url"`                // Landing URL of the clickable link
+	ClickTrackers []string          `json:"clicktrackers"`      // List of third-party tracker URLs to be fired on click of the URL
+	FallbackURL   string            `json:"fallback,omitempty"` // Fallback URL for deeplink. To be used if the URL given in url is not supported by the device.
+	Ext           openrtb.Extension `json:"ext,omitempty"`
+}
diff --git a/native/response/response.go b/native/response/response.go
new file mode 100644
index 0000000..091c0d3
--- /dev/null
+++ b/native/response/response.go
@@ -0,0 +1,13 @@
+package response
+
+import "github.com/bsm/openrtb"
+
+// The native object is the top level JSON object which identifies a native response
+type Response struct {
+	Ver         string            `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
+	JSTracker   string            `json:"jstracker,omitempty"`   // Optional JavaScript impression tracker. This is a valid HTML, Javascript is already wrapped in <script> tags. It should be executed at impression time where it can be supported
+	Ext         openrtb.Extension `json:"ext,omitempty"`
+}
diff --git a/native/response/response_test.go b/native/response/response_test.go
new file mode 100644
index 0000000..0ba5cf0
--- /dev/null
+++ b/native/response/response_test.go
@@ -0,0 +1,47 @@
+package response
+
+import (
+	"encoding/json"
+	"io/ioutil"
+	"testing"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("Response", func() {
+
+	It("should parse correctly", func() {
+		Expect(fixture("testdata/response1.json")).To(Equal(Response{
+			Ver:         "1.1",
+			ImpTrackers: []string{"http://imptracker.com"},
+			JSTracker:   "<script>track()</script>",
+			Link: Link{
+				URL: "http://i.am.a/URL",
+			},
+			Assets: []Asset{
+				{ID: 123, Required: 1, Title: &Title{Text: "Learn about this awesome thing"}},
+				{ID: 124, Required: 1, Image: &Image{URL: "http://www.myads.com/thumbnail1.png"}},
+				{ID: 128, Required: 1, Image: &Image{URL: "http://www.myads.com/largethumb1.png"}},
+				{ID: 126, Required: 1, Data: &Data{Value: "My Brand"}},
+				{ID: 127, Required: 1, Data: &Data{Value: "Learn all about this awesome story of someone using my product."}},
+				{ID: 4, Video: &Video{VASTTag: "<VAST version=\"2.0\"></VAST>"}},
+				{ID: 5, Link: &Link{URL: "http://landing.com", ClickTrackers: []string{"http://tracker.com"}, FallbackURL: "http://fallback.com"}},
+			},
+		}))
+	})
+
+})
+
+func TestSuite(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "openrtb/native/response")
+}
+
+func fixture(path string) Response {
+	var subject Response
+	enc, err := ioutil.ReadFile(path)
+	Expect(err).ToNot(HaveOccurred())
+	Expect(json.Unmarshal(enc, &subject)).To(Succeed())
+	return subject
+}
diff --git a/native/response/testdata/response1.json b/native/response/testdata/response1.json
new file mode 100644
index 0000000..b415b9c
--- /dev/null
+++ b/native/response/testdata/response1.json
@@ -0,0 +1,59 @@
+{
+  "ver": "1.1",
+  "imptrackers": ["http://imptracker.com"],
+  "jstracker": "<script>track()</script>",
+  "link": {
+    "url": "http://i.am.a/URL"
+  },
+  "assets": [
+    {
+      "id": 123,
+      "required": 1,
+      "title": {
+        "text": "Learn about this awesome thing"
+      }
+    },
+    {
+      "id": 124,
+      "required": 1,
+      "img": {
+        "url": "http://www.myads.com/thumbnail1.png"
+      }
+    },
+    {
+      "id": 128,
+      "required": 1,
+      "img": {
+        "url": "http://www.myads.com/largethumb1.png"
+      }
+    },
+    {
+      "id": 126,
+      "required": 1,
+      "data": {
+        "value": "My Brand"
+      }
+    },
+    {
+      "id": 127,
+      "required": 1,
+      "data": {
+        "value": "Learn all about this awesome story of someone using my product."
+      }
+    },
+    {
+      "id": 4,
+      "video": {
+        "vasttag": "<VAST version=\"2.0\"></VAST>"
+      }
+    },
+    {
+      "id": 5,
+      "link": {
+        "url": "http://landing.com",
+        "clicktrackers": ["http://tracker.com"],
+        "fallback": "http://fallback.com"
+      }
+    }
+  ]
+}
diff --git a/native/response/testdata/response2.json b/native/response/testdata/response2.json
new file mode 100644
index 0000000..bf14f55
--- /dev/null
+++ b/native/response/testdata/response2.json
@@ -0,0 +1,6 @@
+ {
+ "link": {
+ "url": "http: //i.am.a/URL"
+ },
+ "assets": [
+ ,
diff --git a/native/response/title.go b/native/response/title.go
new file mode 100644
index 0000000..8fa9af3
--- /dev/null
+++ b/native/response/title.go
@@ -0,0 +1,8 @@
+package response
+
+import "github.com/bsm/openrtb"
+
+type Title struct {
+	Text string            `json:"text"` // The text associated with the text element
+	Ext  openrtb.Extension `json:"ext,omitempty"`
+}
diff --git a/native/response/video.go b/native/response/video.go
new file mode 100644
index 0000000..0209389
--- /dev/null
+++ b/native/response/video.go
@@ -0,0 +1,5 @@
+package response
+
+type Video struct {
+	VASTTag string `json:"vasttag"` // VAST XML
+}
diff --git a/native_test.go b/native_test.go
new file mode 100644
index 0000000..58cb232
--- /dev/null
+++ b/native_test.go
@@ -0,0 +1,23 @@
+package openrtb
+
+import (
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("Native", func() {
+	var subject *Native
+
+	BeforeEach(func() {
+		err := fixture("native", &subject)
+		Expect(err).NotTo(HaveOccurred())
+	})
+
+	It("should parse correctly", func() {
+		Expect(subject).To(Equal(&Native{
+			Request: Extension(`"PAYLOAD"`),
+			Ver:     "2",
+		}))
+	})
+
+})
diff --git a/openrtb.go b/openrtb.go
index 15a79a9..c559a10 100644
--- a/openrtb.go
+++ b/openrtb.go
@@ -1,58 +1,179 @@
 package openrtb
 
+// 5.2 Banner Ad Types
 const (
-	VERSION = "2.2"
-
-	AD_POS_UNKNOWN    = 0
-	AD_POS_ABOVE_FOLD = 1
-	AD_POS_BELOW_FOLD = 3
-	AD_POS_HEADER     = 4
-	AD_POS_FOOTER     = 5
-	AD_POS_SIDEBAR    = 6
-	AD_POS_FULLSCREEN = 7
-
-	BANNER_TYPE_XHTML_TEXT = 1
-	BANNER_TYPE_XHTML      = 2
-	BANNER_TYPE_JS         = 3
-	BANNER_TYPE_FRAME      = 4
-
-	CONN_TYPE_UNKNOWN  = 0
-	CONN_TYPE_ETHERNET = 1
-	CONN_TYPE_WIFI     = 2
-	CONN_TYPE_CELL     = 3
-	CONN_TYPE_CELL_2G  = 4
-	CONN_TYPE_CELL_3G  = 5
-	CONN_TYPE_CELL_4G  = 6
-
-	LOCATION_TYPE_GPS  = 1
-	LOCATION_TYPE_IP   = 2
-	LOCATION_TYPE_USER = 3
-
-	DEVICE_TYPE_UNKNOWN     = 0
-	DEVICE_TYPE_MOBILE      = 1
-	DEVICE_TYPE_PC          = 2
-	DEVICE_TYPE_TV          = 3
-	DEVICE_TYPE_PHONE       = 4
-	DEVICE_TYPE_TABLET      = 5
-	DEVICE_TYPE_CONNECTED   = 6
-	DEVICE_TYPE_SET_TOP_BOX = 7
-
-	VIDEO_LINEARITY_LINEAR     = 1
-	VIDEO_LINEARITY_NON_LINEAR = 2
-
-	VIDEO_PLAYBACK_AUTO_SOUND_ON  = 1
-	VIDEO_PLAYBACK_AUTO_SOUND_OFF = 2
-	VIDEO_PLAYBACK_CLICK_TO_PLAY  = 3
-	VIDEO_PLAYBACK_MOUSE_OVER     = 4
-
-	VIDEO_START_DELAY_PRE_ROLL  = 0
-	VIDEO_START_DELAY_MID_ROLL  = -1
-	VIDEO_START_DELAY_POST_ROLL = -2
-
-	VIDEO_QUALITY_UNKNOWN      = 0
-	VIDEO_QUALITY_PROFESSIONAL = 1
-	VIDEO_QUALITY_PROSUMER     = 2
-	VIDEO_QUALITY_UGC          = 3
+	BannerTypeXHTMLText = 1
+	BannerTypeXHTML     = 2
+	BannerTypeJS        = 3
+	BannerTypeFrame     = 4
+)
+
+// 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
+)
+
+// 5.4 Ad Position
+const (
+	AdPosUnknown    = 0
+	AdPosAboveFold  = 1
+	AdPosBelowFold  = 3
+	AdPosHeader     = 4
+	AdPosFooter     = 5
+	AdPosSidebar    = 6
+	AdPosFullscreen = 7
+)
+
+// 5.5 Expandable Direction
+const (
+	ExpDirLeft       = 1
+	ExpDirRight      = 2
+	ExpDirUp         = 3
+	ExpDirDown       = 4
+	ExpDirFullScreen = 5
+)
+
+// 5.6 API Frameworks
+const (
+	APIFrameworkVPAID1 = 1
+	APIFrameworkVPAID2 = 2
+	APIFrameworkMRAID1 = 3
+	APIFrameworkORMMA  = 4
+	APIFrameworkMRAID2 = 5
+)
+
+// 5.7 Video Linearity
+const (
+	VideoLinearityLinear    = 1
+	VideoLinearityNonLinear = 2
+)
+
+// 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
+)
+
+// 5.9 Video Playback Methods
+const (
+	VideoPlaybackAutoSoundOn  = 1
+	VideoPlaybackAutoSoundOff = 2
+	VideoPlaybackClickToPlay  = 3
+	VideoPlaybackMouseOver    = 4
+)
+
+// 5.10 Video Start Delay
+const (
+	VideoStartDelayPreRoll         = 0
+	VideoStartDelayGenericMidRoll  = -1
+	VideoStartDelayGenericPostRoll = -2
+)
+
+// 5.11 Video Quality
+const (
+	VideoQualityUnknown      = 0
+	VideoQualityProfessional = 1
+	VideoQualityProsumer     = 2
+	VideoQualityUGC          = 3
+)
+
+// 5.12 VAST Companion Types
+const (
+	VASTCompanionStatic = 1
+	VASTCompanionHTML   = 2
+	VASTCompanionIFrame = 3
+)
+
+// 5.13 Content Delivery Methods
+const (
+	ContentDeliveryStreaming   = 1
+	ContentDeliveryProgressive = 2
+	ContentDeliveryDownload    = 3
+)
+
+// 5.14 Content Context
+const (
+	ContextVideo       = 1
+	ContextGame        = 2
+	ContextMusic       = 3
+	ContextApplication = 4
+	ContextText        = 5
+	ContextOther       = 6
+	ContextUnknown     = 7
+)
+
+// 5.15 QAG Media Ratings
+const (
+	QAGAll    = 1
+	QAGOver12 = 2
+	QAGMature = 3
+)
+
+// 5.16 Location Type
+const (
+	LocationTypeGPS  = 1
+	LocationTypeIP   = 2
+	LocationTypeUser = 3
+)
+
+// 5.17 Device Type
+const (
+	DeviceTypeUnknown   = 0
+	DeviceTypeMobile    = 1
+	DeviceTypePC        = 2
+	DeviceTypeTV        = 3
+	DeviceTypePhone     = 4
+	DeviceTypeTablet    = 5
+	DeviceTypeConnected = 6
+	DeviceTypeSetTopBox = 7
+)
+
+// 5.18 Connection Type
+const (
+	ConnTypeUnknown  = 0
+	ConnTypeEthernet = 1
+	ConnTypeWIFI     = 2
+	ConnTypeCell     = 3
+	ConnTypeCell2G   = 4
+	ConnTypeCell3G   = 5
+	ConnTypeCell4G   = 6
+)
+
+// 5.19 No-Bid Reason Codes
+const (
+	NBRUnknownError      = 0
+	NBRTechnicalError    = 1
+	NBRInvalidRequest    = 2
+	NBRKnownSpider       = 3
+	NBRSuspectedNonHuman = 4
+	NBRProxyIP           = 5
+	NBRUnsupportedDevice = 6
+	NBRBlockedSite       = 7
+	NBRUnmatchedUser     = 8
 )
 
 /*************************************************************************
@@ -60,7 +181,7 @@ const (
  *************************************************************************/
 
 // This object may be useful in the situation where syndicated content contains impressions and
-// does not necessarily match the publisher’s general content.  The exchange might or might not
+// 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, video impressions embedded in an iframe on an unknown web property
 // or device.)
@@ -69,11 +190,11 @@ const (
 
 // Abstract third-party
 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    Extensions `json:"ext,omitempty"`
+	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    Extension `json:"ext,omitempty"`
 }
 
 // The publisher object itself and all of its parameters are optional, so default values are not
@@ -91,82 +212,72 @@ type Producer ThirdParty
 // (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
-	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"`
-	Type          *int       `json:"type,omitempty"` // Indicate the source of the geo data
-	Ext           Extensions `json:"ext,omitempty"`
+	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
+	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
+	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"`
+	UTCOffset     int       `json:"utcoffset,omitempty"` // Local time as the number +/- of minutes from UTC
+	Ext           Extension `json:"ext,omitempty"`
 }
 
-// The "user" object contains information known or derived about the human user of the device.
-// Note that the user ID is an exchange artifact (refer to the "device" object for hardware or
-// platform derived IDs) and may be subject to rotation policies. However, this user ID must be
-// stable long enough to serve reasonably as the basis for frequency capping.
+// This 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
-	Buyeruid   *string    `json:"buyeruid,omitempty"` // Buyer's user ID
-	Yob        *int       `json:"yob,omitempty"`      // Year-of-birth
-	Gender     *string    `json:"gender,omitempty"`   // Gender ("M": male, "F" female, "O" Other)
-	Keywords   *string    `json:"keywords,omitempty"`
-	Customdata *string    `json:"customdata,omitempty"`
-	Geo        *Geo       `json:"geo,omitempty"`
-	Data       []Data     `json:"data,omitempty"`
-	Ext        Extensions `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.
+	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        Extension `json:"ext,omitempty"`
 }
 
-// The data and segment objects together allow data about the user to be passed to bidders in the
-// bid request.  This data may be from multiple sources (e.g., the exchange itself, third party
-// providers) as specified by the data object ID field.  A bid request can mix data objects from
-// multiple providers.
+// The 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.
 type Data struct {
-	Id      *string    `json:"id,omitempty"`
-	Name    *string    `json:"name,omitempty"`
-	Segment []Segment  `json:"segment,omitempty"`
-	Ext     Extensions `json:"ext,omitempty"`
+	ID      string    `json:"id,omitempty"`
+	Name    string    `json:"name,omitempty"`
+	Segment []Segment `json:"segment,omitempty"`
+	Ext     Extension `json:"ext,omitempty"`
 }
 
-// The data and segment objects together allow data about the user to be passed to bidders in the
-// bid request.  Segment objects convey specific units of information from the provider identified
-// in the parent data object.
+// Segment objects are essentially key-value pairs that convey specific units of data about the user. The
+// parent Data object is a collection of such values from a given data provider. The specific segment
+// names and value options must be published by the exchange a priori to its bidders.
 type Segment struct {
-	Id    *string    `json:"id,omitempty"`
-	Name  *string    `json:"name,omitempty"`
-	Value *string    `json:"value,omitempty"`
-	Ext   Extensions `json:"ext,omitempty"`
+	ID    string    `json:"id,omitempty"`
+	Name  string    `json:"name,omitempty"`
+	Value string    `json:"value,omitempty"`
+	Ext   Extension `json:"ext,omitempty"`
 }
 
-// The "regs" object contains any legal, governmental, or industry regulations that
-// apply to the request
+// This 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"`
-	Ext   Extensions `json:"ext,omitempty"`
+	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   Extension `json:"ext,omitempty"`
 }
 
-// Private Marketplace Object
-type Pmp struct {
-	Private *int         `json:"private_auction,omitempty"`
-	Deals   []DirectDeal `json:"deals,omitempty"`
-	Ext     Extensions   `json:"ext,omitempty"`
+// This 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 Extension `json:"ext,omitempty"`
 }
-
-// PMP Direct Deal
-type DirectDeal struct {
-	Id          *string    `json:"id,omitempty"` // Unique deal ID
-	Bidfloor    *float32   `json:"bidfloor,omitempty"`
-	Bidfloorcur *string    `json:"bidfloorcur,omitempty"` // Currency of bid floor
-	Wseat       []string   `json:"wseat,omitempty"`       // Array of buyer seats allowed to bid on this Direct Deal.
-	Wadomain    []string   `json:"wadomain,omitempty"`    // Array of advertiser domains allowed to bid on this Direct Deal
-	At          *int       `json:"at,omitempty"`          // Auction type, Default: 2 ("1": first price auction, "2": then second price auction)
-	Ext         Extensions `json:"ext,omitempty"`
-
-	Seats []string `json:"seats,omitempty"` // DEPRECATED: kept for backwards compatibility
-	Type  *int     `json:"type,omitempty"`  // DEPRECATED: kept for backwards compatibility
-}
-
-// General Extensions
-type Extensions map[string]interface{}
diff --git a/openrtb_test.go b/openrtb_test.go
index f07444a..a821e5e 100644
--- a/openrtb_test.go
+++ b/openrtb_test.go
@@ -1,17 +1,28 @@
 package openrtb
 
 import (
+	"encoding/json"
+	"os"
+	"path/filepath"
 	"testing"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
 
-/*******************************************************************
- * TEST SUITE HOOK
- *******************************************************************/
-
 func TestSuite(t *testing.T) {
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "openrtb")
 }
+
+func iptr(n int) *int       { return &n }
+func sptr(s string) *string { return &s }
+
+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
new file mode 100644
index 0000000..9078e27
--- /dev/null
+++ b/pmp.go
@@ -0,0 +1,50 @@
+package openrtb
+
+import "encoding/json"
+
+// Private Marketplace Object
+type Pmp struct {
+	Private int       `json:"private_auction,omitempty"`
+	Deals   []Deal    `json:"deals,omitempty"`
+	Ext     Extension `json:"ext,omitempty"`
+}
+
+// PMP Deal
+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
+	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              Extension `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
+
+// MarshalJSON custom marshalling with normalization
+func (d *Deal) MarshalJSON() ([]byte, error) {
+	d.normalize()
+	return json.Marshal((*jsonDeal)(d))
+}
+
+// UnmarshalJSON custom unmarshalling with normalization
+func (d *Deal) UnmarshalJSON(data []byte) error {
+	var h jsonDeal
+	if err := json.Unmarshal(data, &h); err != nil {
+		return err
+	}
+
+	*d = (Deal)(h)
+	d.normalize()
+	return nil
+}
+
+func (d *Deal) normalize() {
+	if d.AuctionType == 0 {
+		d.AuctionType = 2
+	}
+}
diff --git a/pmp_test.go b/pmp_test.go
new file mode 100644
index 0000000..2f16436
--- /dev/null
+++ b/pmp_test.go
@@ -0,0 +1,34 @@
+package openrtb
+
+import (
+	"encoding/json"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("Pmp", func() {
+	var subject *Pmp
+
+	BeforeEach(func() {
+		err := fixture("pmp", &subject)
+		Expect(err).NotTo(HaveOccurred())
+	})
+
+	It("should parse correctly", func() {
+		Expect(subject).To(Equal(&Pmp{
+			Private: 1,
+			Deals: []Deal{
+				{ID: "DX-1985-010A", BidFloor: 2.5, BidFloorCurrency: "", AuctionType: 2},
+				{ID: "DX-1986-010A", BidFloor: 2.6, BidFloorCurrency: "", AuctionType: 2},
+			},
+		}))
+	})
+
+	It("should generate correctly", func() {
+		bin, err := json.Marshal(&Pmp{Deals: []Deal{{}}})
+		Expect(err).NotTo(HaveOccurred())
+		Expect(string(bin)).To(Equal(`{"deals":[{"at":2}]}`))
+	})
+
+})
diff --git a/request.go b/request.go
deleted file mode 100644
index 027d67a..0000000
--- a/request.go
+++ /dev/null
@@ -1,119 +0,0 @@
-package openrtb
-
-import (
-	"encoding/json"
-	"errors"
-	"io"
-)
-
-// 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 Request 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"`
-	At      *int         `json:"at"`                // Auction type, Default: 2 ("1": first price auction, "2": then second price auction)
-	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
-	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
-	Regs    *Regulations `json:"regs,omitempty"`
-	Ext     Extensions   `json:"ext,omitempty"`
-
-	Pmp *Pmp `json:"pmp,omitempty"` // DEPRECATED: kept for backwards compatibility
-}
-
-// Parses an OpenRTB Request struct from an io.Reader
-// Optionally validates and applies defaults to the Request object (recommended)
-func ParseRequest(reader io.Reader) (req *Request, err error) {
-	dec := json.NewDecoder(reader)
-	if err = dec.Decode(&req); err != nil {
-		return nil, err
-	}
-	return req.WithDefaults(), nil
-}
-
-// Parses an OpenRTB Request from bytes
-// Optionally validates and applies defaults to the Request object (recommended)
-func ParseRequestBytes(data []byte) (req *Request, err error) {
-	if err = json.Unmarshal(data, &req); err != nil {
-		return nil, err
-	}
-	return req.WithDefaults(), nil
-}
-
-// Validation errors
-var (
-	ErrInvalidReqID  = errors.New("openrtb parse: request ID missing")
-	ErrInvalidReqImp = errors.New("openrtb parse: no impressions")
-	ErrInvalidReqSrc = errors.New("openrtb parse: request has site and app")
-)
-
-// Validates the request
-func (req *Request) Valid() (bool, error) {
-	if req.Id == nil {
-		return false, ErrInvalidReqID
-	} else if len(req.Imp) == 0 {
-		return false, ErrInvalidReqImp
-	} else if req.Site != nil && req.App != nil {
-		return false, ErrInvalidReqSrc
-	}
-
-	for _, imp := range req.Imp {
-		if ok, err := (&imp).Valid(); !ok {
-			return ok, err
-		}
-	}
-
-	return true, nil
-}
-
-// Applies defaults
-func (req *Request) WithDefaults() *Request {
-	if req.At == nil {
-		req.At = new(int)
-		*req.At = 2
-	}
-
-	if req.Site != nil {
-		req.Site.WithDefaults()
-	}
-	if req.App != nil {
-		req.App.WithDefaults()
-	}
-	if req.Device != nil {
-		req.Device.WithDefaults()
-	}
-	for i, imp := range req.Imp {
-		req.Imp[i] = *(&imp).WithDefaults()
-	}
-
-	return req
-}
-
-// Set the ID
-func (req *Request) SetId(id string) *Request {
-	if req.Id == nil {
-		req.Id = new(string)
-	}
-	*req.Id = id
-	return req
-}
-
-// Set the Site
-func (req *Request) SetSite(site *Site) *Request {
-	req.Site = site
-	return req
-}
-
-// Set the App
-func (req *Request) SetApp(app *App) *Request {
-	req.App = app
-	return req
-}
diff --git a/request_test.go b/request_test.go
deleted file mode 100644
index 653cc20..0000000
--- a/request_test.go
+++ /dev/null
@@ -1,220 +0,0 @@
-package openrtb
-
-import (
-	"bytes"
-
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-)
-
-var _ = Describe("Request", func() {
-	var subject *Request
-	var sptr = func(s string) *string { return &s }
-	var iptr = func(n int) *int { return &n }
-	var fptr = func(f float32) *float32 { return &f }
-
-	BeforeEach(func() {
-		subject = new(Request)
-	})
-
-	It("should should parse requests", func() {
-		req, err := ParseRequest(bytes.NewBuffer(testFixtures.expandableCreative))
-		Expect(err).NotTo(HaveOccurred())
-
-		Expect(req.Imp).To(Equal([]Impression{
-			{
-				Id: sptr("1"),
-				Banner: &Banner{
-					W:        iptr(300),
-					H:        iptr(250),
-					Wmin:     iptr(300),
-					Hmin:     iptr(250),
-					Pos:      iptr(1),
-					Topframe: iptr(0),
-					Battr:    []int{13},
-					Expdir:   []int{2, 4},
-				},
-				Instl:        iptr(0),
-				Bidfloor:     fptr(0),
-				Bidfloorcur:  sptr("USD"),
-				Secure:       iptr(0),
-				Iframebuster: []string{"vendor1.com", "vendor2.com"},
-			},
-		}))
-
-		Expect(req.Site).To(Equal(&Site{
-			Id:            sptr("1345135123"),
-			Name:          sptr("Site ABCD"),
-			Domain:        sptr("siteabcd.com"),
-			Page:          sptr("http://siteabcd.com/page.htm"),
-			Privacypolicy: iptr(1),
-			Ref:           sptr("http://referringsite.com/referringpage.htm"),
-			Publisher:     &Publisher{Id: sptr("pub12345"), Name: sptr("Publisher A")},
-		}))
-
-		Expect(req.Device).To(Equal(&Device{
-			Dnt:            iptr(0),
-			Ua:             sptr("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:             sptr("64.124.253.1"),
-			Os:             sptr("OS X"),
-			Js:             iptr(1),
-			Connectiontype: iptr(0),
-			Devicetype:     iptr(0),
-			Flashver:       sptr("10.1"),
-		}))
-
-		Expect(req.User).To(Equal(&User{
-			Id:       sptr("456789876567897654678987656789"),
-			Buyeruid: sptr("545678765467876567898765678987654"),
-			Data: []Data{
-				{
-					Id:   sptr("6"),
-					Name: sptr("Data Provider 1"),
-					Segment: []Segment{
-						{Id: sptr("12341318394918"), Name: sptr("auto intenders")},
-						{Id: sptr("1234131839491234"), Name: sptr("auto enthusiasts")},
-						{Id: sptr("23423424"), Name: sptr("data-provider1-age"), Value: sptr("30-40")},
-					},
-				},
-			},
-		}))
-	})
-
-	Describe("ParseRequestBytes()", func() {
-		It("should return blank request with defaults when blank", func() {
-			req, err := ParseRequestBytes([]byte("{}"))
-			Expect(err).NotTo(HaveOccurred())
-			Expect(req).To(BeAssignableToTypeOf(&Request{}))
-		})
-
-		It("should return accordingly when with simple banner", func() {
-			req, err := ParseRequestBytes(testFixtures.simpleBanner)
-			Expect(err).NotTo(HaveOccurred())
-			Expect(req).To(BeAssignableToTypeOf(&Request{}))
-
-			Expect(*req.At).To(Equal(2))
-			Expect(*req.Id).To(Equal("1234534625254"))
-
-			Expect(len(req.Badv)).To(Equal(2))
-			Expect(len(req.Bcat)).To(Equal(0))
-			Expect(len(req.Imp)).To(Equal(1))
-
-			Expect(*req.Imp[0].Banner.W).To(Equal(300))
-			Expect(*req.Imp[0].Banner.H).To(Equal(250))
-			Expect(*req.Site.Name).To(Equal("Site ABCD"))
-			Expect(*req.Site.Publisher.Name).To(Equal("Publisher A"))
-			Expect(*req.Device.Ip).To(Equal("64.124.253.1"))
-			Expect(*req.User.Buyeruid).To(Equal("5df678asd8987656asdf78987654"))
-		})
-
-		It("should return accordingly when with expandable creatives", func() {
-			req, err := ParseRequestBytes(testFixtures.expandableCreative)
-			Expect(err).NotTo(HaveOccurred())
-			Expect(req).To(BeAssignableToTypeOf(&Request{}))
-
-			Expect(*req.At).To(Equal(2))
-			Expect(*req.Tmax).To(Equal(120))
-			Expect(req.Imp[0].Banner.Expdir).To(Equal([]int{2, 4}))
-			Expect(*req.Site.Privacypolicy).To(Equal(1))
-			Expect(*req.Device.Flashver).To(Equal("10.1"))
-			Expect(*req.User.Data[0].Id).To(Equal("6"))
-			Expect(*req.User.Data[0].Segment[2].Id).To(Equal("23423424"))
-
-			Expect(len(req.User.Data)).To(Equal(1))
-			Expect(len(req.User.Data[0].Segment)).To(Equal(3))
-		})
-	})
-
-	Describe("Valid()", func() {
-		var (
-			site       *Site
-			app        *App
-			impression *Impression
-			banner     *Banner
-		)
-
-		BeforeEach(func() {
-			site = new(Site)
-			app = new(App)
-			impression = new(Impression)
-			banner = new(Banner)
-		})
-
-		It("should return error messages when attributes missing", func() {
-			ok, err := subject.Valid()
-			Expect(err.Error()).To(Equal("openrtb parse: request ID missing"))
-
-			subject.SetId("RAND_ID") // With ID
-			ok, err = subject.Valid()
-			Expect(err.Error()).To(Equal("openrtb parse: no impressions"))
-
-			subject.SetSite(site) // With Site
-			ok, err = subject.Valid()
-			Expect(err.Error()).To(Equal("openrtb parse: no impressions"))
-
-			subject.SetApp(app) // With App
-			ok, err = subject.Valid()
-			Expect(err.Error()).To(Equal("openrtb parse: no impressions"))
-
-			// With Impression
-			impression.SetId("IMPID").SetBanner(banner).WithDefaults()
-			subject.Imp = []Impression{*impression}
-			ok, err = subject.Valid()
-			Expect(err.Error()).To(Equal("openrtb parse: request has site and app"))
-
-			// with valid attrs
-			subject.App = nil
-			ok, err = subject.Valid()
-			Expect(err).NotTo(HaveOccurred())
-			Expect(ok).To(BeTrue())
-		})
-
-	})
-
-	Describe("WithDefaults()", func() {
-
-		var (
-			site       *Site
-			app        *App
-			device     *Device
-			impression *Impression
-			banner     *Banner
-			video      *Video
-		)
-
-		BeforeEach(func() {
-			site = new(Site)
-			app = new(App)
-			device = new(Device)
-			impression = new(Impression)
-			banner = new(Banner)
-			video = new(Video)
-
-			impression.SetBanner(banner).SetVideo(video)
-			subject.Site = site
-			subject.App = app
-			subject.Device = device
-			subject.Imp = []Impression{*impression}
-		})
-
-		It("should return blank request with default values", func() {
-			request := subject.WithDefaults()
-			Expect(*request.At).To(Equal(2))
-			Expect(*request.App.Privacypolicy).To(Equal(0))
-			Expect(*request.App.Paid).To(Equal(0))
-			Expect(*request.Site.Privacypolicy).To(Equal(0))
-			Expect(*request.Device.Dnt).To(Equal(0))
-			Expect(*request.Device.Js).To(Equal(0))
-			Expect(*request.Device.Connectiontype).To(Equal(CONN_TYPE_UNKNOWN))
-			Expect(*request.Device.Devicetype).To(Equal(DEVICE_TYPE_UNKNOWN))
-			Expect(*request.Imp[0].Instl).To(Equal(0))
-			Expect(*request.Imp[0].Bidfloor).To(Equal(float32(0)))
-			Expect(*request.Imp[0].Bidfloorcur).To(Equal("USD"))
-			Expect(*request.Imp[0].Banner.Topframe).To(Equal(0))
-			Expect(*request.Imp[0].Banner.Pos).To(Equal(AD_POS_UNKNOWN))
-			Expect(*request.Imp[0].Video.Sequence).To(Equal(1))
-			Expect(*request.Imp[0].Video.Boxingallowed).To(Equal(1))
-			Expect(*request.Imp[0].Video.Pos).To(Equal(AD_POS_UNKNOWN))
-		})
-	})
-})
diff --git a/response.go b/response.go
deleted file mode 100644
index d26aa31..0000000
--- a/response.go
+++ /dev/null
@@ -1,62 +0,0 @@
-package openrtb
-
-import (
-	"encoding/json"
-	"errors"
-	"io"
-)
-
-// 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 Response struct {
-	Id         *string    `json:"id"`                   // Reflection of the bid request ID for logging purposes
-	Seatbid    []Seatbid  `json:"seatbid"`              // Array of seatbid objects
-	Bidid      *string    `json:"bidid,omitempty"`      // Optional response tracking ID for bidders
-	Cur        *string    `json:"cur,omitempty"`        // Bid currency
-	Customdata *string    `json:"customdata,omitempty"` // Encoded user features
-	Ext        Extensions `json:"ext,omitempty"`        // Custom specifications in Json
-}
-
-// Validation errors
-var (
-	ErrInvalidResID      = errors.New("openrtb response: missing ID")
-	ErrInvalidResSeatbid = errors.New("openrtb response: missing seatbids")
-)
-
-//Parses an OpenRTB Response from an io.Reader
-func ParseResponse(reader io.Reader) (resp *Response, err error) {
-	dec := json.NewDecoder(reader)
-	if err = dec.Decode(&resp); err != nil {
-		return nil, err
-	}
-	return resp, nil
-}
-
-//Parses an OpenRTB Response from bytes
-func ParseResponseBytes(data []byte) (resp *Response, err error) {
-	if err = json.Unmarshal(data, &resp); err != nil {
-		return nil, err
-	}
-	return resp, nil
-}
-
-// Validate Response required attributes
-// @return [Boolean,Error] true if response,seatbid,bid required attrs present
-func (res *Response) Valid() (bool, error) {
-
-	if res.Id == nil {
-		return false, ErrInvalidResID
-	} else if res.Seatbid == nil || len(res.Seatbid) < 1 {
-		return false, ErrInvalidResSeatbid
-	}
-
-	for _, sb := range res.Seatbid {
-		if ok, err := sb.Valid(); !ok {
-			return ok, err
-		}
-	}
-
-	return true, nil
-}
diff --git a/response_test.go b/response_test.go
deleted file mode 100644
index 9c816e8..0000000
--- a/response_test.go
+++ /dev/null
@@ -1,54 +0,0 @@
-package openrtb
-
-import (
-	"bytes"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-)
-
-var _ = Describe("Response", func() {
-	var subject *Response
-	var sptr = func(s string) *string { return &s }
-	var fptr = func(f float32) *float32 { return &f }
-
-	BeforeEach(func() {
-		subject = new(Response)
-	})
-
-	It("should validate", func() {
-		ok, err := subject.Valid()
-		Expect(err).To(Equal(ErrInvalidResID))
-		Expect(ok).To(BeFalse())
-
-		subject.Id = new(string)
-		*subject.Id = "RES_ID"
-		bid := (&Bid{}).SetID("BIDID").SetImpID("IMPID").SetPrice(0.0)
-		sb := Seatbid{}
-		sb.Bid = append(sb.Bid, *bid)
-		subject.Seatbid = append(subject.Seatbid, sb)
-
-		ok, err = subject.Valid()
-		Expect(err).NotTo(HaveOccurred())
-		Expect(ok).To(BeTrue())
-	})
-
-	It("should parse responses", func() {
-		resp, err := ParseResponse(bytes.NewBuffer(testFixtures.simpleResponse))
-		Expect(err).NotTo(HaveOccurred())
-
-		bid := Bid{
-			Id:      sptr("32a69c6ba388f110487f9d1e63f77b22d86e916b"),
-			Impid:   sptr("32a69c6ba388f110487f9d1e63f77b22d86e916b"),
-			Price:   fptr(0.065445),
-			Adid:    sptr("529833ce55314b19e8796116"),
-			Nurl:    sptr("http://ads.com/win/529833ce55314b19e8796116?won=${auction_price}"),
-			Adm:     sptr("<iframe src=\"foo.bar\"/>"),
-			Adomain: []string{},
-			Attr:    []int{},
-			Cid:     sptr("529833ce55314b19e8796116"),
-			Crid:    sptr("529833ce55314b19e8796116_1385706446"),
-		}
-
-		Expect(resp.Seatbid[0].Bid[0]).To(Equal(bid))
-	})
-})
diff --git a/seatbid.go b/seatbid.go
index d14c641..fa8bf27 100644
--- a/seatbid.go
+++ b/seatbid.go
@@ -1,39 +1,36 @@
 package openrtb
 
-import (
-	"errors"
-)
+import "errors"
 
 // 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.
+// 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.
-	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   Extensions `json:"ext,omitempty"`
+type SeatBid struct {
+	Bid   []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   Extension `json:"ext,omitempty"`
 }
 
 // Validation errors
 var (
-	ErrInvalidSeatbidBid = errors.New("openrtb response: seatbid is missing bids")
+	ErrInvalidSeatBidBid = errors.New("openrtb: seatbid is missing bids")
 )
 
-// Validate Seatbid required attributes
-func (sb *Seatbid) Valid() (bool, error) {
-
-	if sb.Bid == nil || len(sb.Bid) < 1 {
-		return false, ErrInvalidSeatbidBid
+// Validate required attributes
+func (sb *SeatBid) Validate() error {
+	if len(sb.Bid) == 0 {
+		return ErrInvalidSeatBidBid
 	}
 
 	for _, bid := range sb.Bid {
-		if ok, err := bid.Valid(); !ok {
-			return ok, err
+		if err := bid.Validate(); err != nil {
+			return err
 		}
 	}
 
-	return true, nil
+	return nil
 }
diff --git a/seatbid_test.go b/seatbid_test.go
index 5300871..323cd8e 100644
--- a/seatbid_test.go
+++ b/seatbid_test.go
@@ -5,24 +5,13 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-var _ = Describe("Seatbid", func() {
-	var subject *Seatbid
+var _ = Describe("SeatBid", func() {
 
-	BeforeEach(func() {
-		subject = new(Seatbid)
-	})
-
-	It("should have validation", func() {
-		ok, err := subject.Valid()
-		Expect(err).To(HaveOccurred())
-		Expect(ok).To(BeFalse())
-
-		bid := (&Bid{}).SetID("BIDID").SetImpID("IMPID").SetPrice(0.0)
-		subject.Bid = append(subject.Bid, *bid)
-
-		ok, err = subject.Valid()
-		Expect(err).NotTo(HaveOccurred())
-		Expect(ok).To(BeTrue())
+	It("should validate", func() {
+		Expect((&SeatBid{}).Validate()).To(Equal(ErrInvalidSeatBidBid))
+		Expect((&SeatBid{Bid: []Bid{
+			{ID: "BIDID", ImpID: "IMPID"}},
+		}).Validate()).NotTo(HaveOccurred())
 	})
 
 })
diff --git a/site.go b/site.go
deleted file mode 100644
index 3495d90..0000000
--- a/site.go
+++ /dev/null
@@ -1,38 +0,0 @@
-package openrtb
-
-// A 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 {
-	Id            *string    `json:"id,omitempty"`   // Site ID on the exchange
-	Name          *string    `json:"name,omitempty"` // Site name
-	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
-	Page          *string    `json:"page,omitempty"`          // URL of the page
-	Privacypolicy *int       `json:"privacypolicy,omitempty"` // Default: 1 ("1": site has a privacy policy)
-	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)
-	Publisher     *Publisher `json:"publisher,omitempty"`
-	// Content       Content
-	Keywords *string    `json:"keywords,omitempty"`
-	Ext      Extensions `json:"ext,omitempty"`
-}
-
-// Returns the privacy policy status, with default fallback
-func (s *Site) IsPrivacyPolicy() bool {
-	if s.Privacypolicy != nil {
-		return *s.Privacypolicy == 1
-	}
-	return false
-}
-
-// Applies defaults
-func (s *Site) WithDefaults() *Site {
-	if s.Privacypolicy == nil {
-		s.Privacypolicy = new(int)
-		*s.Privacypolicy = 0
-	}
-	return s
-}
diff --git a/site_test.go b/site_test.go
deleted file mode 100644
index 66d3bec..0000000
--- a/site_test.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package openrtb
-
-import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-)
-
-var _ = Describe("Site", func() {
-	var subject *Site
-
-	BeforeEach(func() {
-		subject = new(Site)
-	})
-
-	It("should have accessors", func() {
-		Expect(subject.IsPrivacyPolicy()).To(BeFalse())
-	})
-
-	It("should have defaults", func() {
-		subject.WithDefaults()
-		Expect(*subject.Privacypolicy).To(Equal(0))
-	})
-})
diff --git a/testdata/app.json b/testdata/app.json
new file mode 100644
index 0000000..a72e366
--- /dev/null
+++ b/testdata/app.json
@@ -0,0 +1,17 @@
+{
+  "id": "agltb3B1Yi1pbmNyDAsSA0FwcBiJkfIUDA",
+  "name": "Yahoo Weather",
+  "cat": [
+    "weather",
+    "IAB15",
+    "IAB15-10"
+  ],
+  "ver": "1.0.2",
+  "bundle": "628677149",
+  "publisher": {
+    "id": "agltb3B1Yi1pbmNyDAsSA0FwcBiJkfTUCV",
+    "name": "yahoo",
+    "domain": "www.yahoo.com"
+  },
+  "storeurl": "https://itunes.apple.com/id628677149"
+}
diff --git a/testdata/audio.json b/testdata/audio.json
new file mode 100644
index 0000000..5fb7140
--- /dev/null
+++ b/testdata/audio.json
@@ -0,0 +1,59 @@
+{
+  "w": 640,
+  "h": 480,
+  "pos": 1,
+  "startdelay": 0,
+  "minduration": 5,
+  "maxduration": 30,
+  "maxextended": 30,
+  "minbitrate": 300,
+  "maxbitrate": 1500,
+  "api": [
+    1,
+    2
+  ],
+  "protocols": [
+    9,
+    10
+  ],
+  "mimes": [
+    "audio/mp4"
+  ],
+  "delivery": [
+    2
+  ],
+  "battr": [
+    13,
+    14
+  ],
+  "companionad": [
+    {
+      "id": "1234567893-1",
+      "w": 300,
+      "h": 250,
+      "pos": 1,
+      "battr": [
+        13,
+        14
+      ],
+      "expdir": [
+        2,
+        4
+      ]
+    },
+    {
+      "id": "1234567893-2",
+      "w": 728,
+      "h": 90,
+      "pos": 1,
+      "battr": [
+        13,
+        14
+      ]
+    }
+  ],
+  "companiontype": [
+    1,
+    2
+  ]
+}
diff --git a/testdata/banner.json b/testdata/banner.json
new file mode 100644
index 0000000..245fb14
--- /dev/null
+++ b/testdata/banner.json
@@ -0,0 +1,14 @@
+{
+  "w": 728,
+  "h": 90,
+  "pos": 1,
+  "btype": [
+    4
+  ],
+  "battr": [
+    14
+  ],
+  "api": [
+    3
+  ]
+}
diff --git a/testdata/bid.json b/testdata/bid.json
new file mode 100644
index 0000000..da029af
--- /dev/null
+++ b/testdata/bid.json
@@ -0,0 +1,16 @@
+{
+  "id": "1",
+  "impid": "1",
+  "price": 0.751371,
+  "adid": "52a5516d29e435137c6f6e74",
+  "nurl": "http://ads.com/win/112770_1386565997?won=${AUCTION_PRICE}",
+  "adm": "<html/>",
+  "adomain": [
+    "ads.com"
+  ],
+  "iurl": "http://ads.com/112770_1386565997.jpeg",
+  "cid": "52a5516d29e435137c6f6e74",
+  "crid": "52a5516d29e435137c6f6e74_1386565997",
+  "dealid": "example_deal",
+  "attr": []
+}
diff --git a/testdata/breq.banner.json b/testdata/breq.banner.json
new file mode 100644
index 0000000..b6b2245
--- /dev/null
+++ b/testdata/breq.banner.json
@@ -0,0 +1,54 @@
+{
+  "id": "1234534625254",
+  "at": 2,
+  "tmax": 120,
+  "imp": [
+    {
+      "id": "1",
+      "secure": "1",
+      "banner": {
+        "w": 300,
+        "h": 250,
+        "pos": 1,
+        "battr": [
+          13
+        ]
+      }
+    }
+  ],
+  "badv": [
+    "company1.com",
+    "company2.com"
+  ],
+  "site": {
+    "id": "234563",
+    "name": "Site ABCD",
+    "domain": "siteabcd.com",
+    "cat": [
+      "IAB2-1",
+      "IAB2-2"
+    ],
+    "privacypolicy": 1,
+    "page": "http://siteabcd.com/page.htm",
+    "ref": "http://referringsite.com/referringpage.htm",
+    "publisher": {
+      "id": "pub12345",
+      "name": "Publisher A"
+    },
+    "content": {
+      "keywords": "keyword a,keyword b,keyword c"
+    }
+  },
+  "device": {
+    "ip": "64.124.253.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",
+    "os": "OS X",
+    "flashver": "10.1",
+    "js": 1
+  },
+  "user": {
+    "id": "45asdf987656789adfad4678rew656789",
+    "buyeruid": "5df678asd8987656asdf78987654"
+  },
+  "test": 1
+}
diff --git a/testdata/breq.exp.json b/testdata/breq.exp.json
new file mode 100644
index 0000000..b952c22
--- /dev/null
+++ b/testdata/breq.exp.json
@@ -0,0 +1,83 @@
+{
+  "id": "1234567893",
+  "at": 2,
+  "tmax": 120,
+  "imp": [
+    {
+      "id": "1",
+      "iframebuster": [
+        "vendor1.com",
+        "vendor2.com"
+      ],
+      "banner": {
+        "w": 300,
+        "h": 250,
+        "wmin": 300,
+        "hmin": 250,
+        "pos": 1,
+        "battr": [
+          13
+        ],
+        "expdir": [
+          2,
+          4
+        ]
+      }
+    }
+  ],
+  "site": {
+    "id": "1345135123",
+    "name": "Site ABCD",
+    "domain": "siteabcd.com",
+    "sitecat": [
+      "IAB2-1",
+      "IAB2-2"
+    ],
+    "page": "http://siteabcd.com/page.htm",
+    "ref": "http://referringsite.com/referringpage.htm",
+    "privacypolicy": 1,
+    "publisher": {
+      "id": "pub12345",
+      "name": "Publisher A"
+    },
+    "content": {
+      "keyword": [
+        "keyword1",
+        "keyword2",
+        "keyword3"
+      ]
+    }
+  },
+  "device": {
+    "ip": "64.124.253.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",
+    "os": "OS X",
+    "flashver": "10.1",
+    "js": 1
+  },
+  "user": {
+    "id": "456789876567897654678987656789",
+    "buyeruid": "545678765467876567898765678987654",
+    "data": [
+      {
+        "id": "6",
+        "name": "Data Provider 1",
+        "segment": [
+          {
+            "id": "12341318394918",
+            "name": "auto intenders"
+          },
+          {
+            "id": "1234131839491234",
+            "name": "auto enthusiasts"
+          },
+          {
+            "id": "23423424",
+            "name": "data-provider1-age",
+            "value": "30-40"
+          }
+        ]
+      }
+    ]
+  }
+}
diff --git a/testdata/breq.native.json b/testdata/breq.native.json
new file mode 100644
index 0000000..c321511
--- /dev/null
+++ b/testdata/breq.native.json
@@ -0,0 +1,47 @@
+{
+  "id": "80ce30c53c16e6ede735f123ef6e32361bfc7b22",
+  "at": 1,
+  "cur": [
+    "USD"
+  ],
+  "imp": [
+    {
+      "id": "1",
+      "bidfloor": 0.03,
+      "native": {
+        "request": "...Native Spec request as an encoded string...",
+        "ver": "1.0",
+        "api": [
+          3
+        ],
+        "battr": [
+          13,
+          14
+        ]
+      }
+    }
+  ],
+  "site": {
+    "id": "102855",
+    "cat": [
+      "IAB3-1"
+    ],
+    "domain": "www.foobar.com",
+    "page": "http://www.foobar.com/1234.html ",
+    "publisher": {
+      "id": "8953",
+      "name": "foobar.com",
+      "cat": [
+        "IAB3-1"
+      ],
+      "domain": "foobar.com"
+    }
+  },
+  "device": {
+    "ua": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/537.13 (KHTML, like Gecko) Version/5.1.7 Safari/534.57.2",
+    "ip": "123.145.167.10"
+  },
+  "user": {
+    "id": "55816b39711f9b5acf3b90e313ed29e51665623f"
+  }
+}
diff --git a/testdata/breq.video.json b/testdata/breq.video.json
new file mode 100644
index 0000000..2107315
--- /dev/null
+++ b/testdata/breq.video.json
@@ -0,0 +1,230 @@
+{
+  "id": "0123456789ABCDEF0123456789ABCDEF",
+  "at": 2,
+  "tmax": 120,
+  "imp": [
+    {
+      "id": "1",
+      "pmp": {
+        "private_auction": 1,
+        "deals": [
+          {
+            "id": "1452f.eadb4.7aaa",
+            "bidfloor": 5.3,
+            "at": 1,
+            "wseats": [],
+            "ext": {
+              "priority": 1,
+              "wadvs": []
+            }
+          }
+        ]
+      },
+      "video": {
+        "mimes": [
+          "video/x-flv",
+          "video/mp4",
+          "application/x-shockwave-flash",
+          "application/javascript"
+        ],
+        "api": [
+          1,
+          2
+        ],
+        "battr": [
+          13,
+          14
+        ],
+        "boxingallowed": 1,
+        "delivery": [
+          2
+        ],
+        "h": 480,
+        "linearity": 1,
+        "maxbitrate": 1500,
+        "maxduration": 30,
+        "minbitrate": 300,
+        "minduration": 5,
+        "playbackmethod": [
+          1
+        ],
+        "pos": 1,
+        "protocols": [
+          2,
+          3
+        ],
+        "sequence": 1,
+        "startdelay": 0,
+        "w": 640
+      }
+    },
+    {
+      "id": "2",
+      "pmp": {
+        "private_auction": 1,
+        "deals": [
+          {
+            "id": "1452f.eadb4.7aaa",
+            "bidfloor": 3.5,
+            "at": 1,
+            "wseats": [],
+            "ext": {
+              "priority": 1,
+              "wadvs": []
+            }
+          },
+          {
+            "id": "1452f.eadb4.f9bc",
+            "bidfloor": 2.5,
+            "at": 1,
+            "wseats": [
+              "45",
+              "165",
+              "33"
+            ],
+            "ext": {
+              "priority": 2,
+              "wadvs": []
+            }
+          }
+        ]
+      },
+      "video": {
+        "mimes": [
+          "video/x-flv",
+          "video/mp4",
+          "application/x-shockwave-flash",
+          "application/javascript"
+        ],
+        "api": [
+          1,
+          2
+        ],
+        "battr": [
+          13,
+          14
+        ],
+        "boxingallowed": 1,
+        "delivery": [
+          2
+        ],
+        "h": 480,
+        "linearity": 1,
+        "maxbitrate": 1500,
+        "maxduration": 60,
+        "minbitrate": 300,
+        "minduration": 30,
+        "playbackmethod": [
+          1
+        ],
+        "pos": 1,
+        "protocols": [
+          2,
+          3
+        ],
+        "sequence": 2,
+        "startdelay": 300,
+        "w": 640
+      }
+    },
+    {
+      "id": "3",
+      "bidfloor": 2.00,
+      "video": {
+        "mimes": [
+          "video/x-flv",
+          "video/mp4",
+          "application/x-shockwave-flash",
+          "application/javascript"
+        ],
+        "api": [
+          1,
+          2
+        ],
+        "battr": [
+          13,
+          14
+        ],
+        "boxingallowed": 1,
+        "delivery": [
+          2
+        ],
+        "h": 480,
+        "linearity": 1,
+        "maxbitrate": 1500,
+        "maxduration": 60,
+        "minbitrate": 300,
+        "minduration": 30,
+        "playbackmethod": [
+          1
+        ],
+        "pos": 1,
+        "protocols": [
+          2,
+          3
+        ],
+        "sequence": 3,
+        "startdelay": -2,
+        "w": 640
+      }
+    }
+  ],
+  "site": {
+    "id": "1345135123",
+    "name": "Site ABCD",
+    "domain": "siteabcd.com",
+    "cat": [
+      "IAB2-1",
+      "IAB2-2"
+    ],
+    "page": "http://siteabcd.com/page.htm",
+    "ref": "http://referringsite.com/referringpage.htm",
+    "privacypolicy": 1,
+    "publisher": {
+      "id": "pub12345",
+      "name": "Publisher A"
+    },
+    "content": {
+      "cat": [
+        "IAB2-2"
+      ],
+      "episode": 23,
+      "id": "1234567",
+      "keyword": [
+        "keyword a",
+        "keyword b",
+        "keyword c"
+      ],
+      "season": "2",
+      "series": "All About Cars",
+      "title": "Car Show"
+    }
+  },
+  "device": {
+    "ip": "64.124.253.1",
+    "ua": "Mozilla/5.0 (Mac; U; Intel Mac OS X 10.6; en-US; rv:1.9.2.16) Gecko/20140420 Firefox/3.6.16",
+    "os": "OS X",
+    "flashversion": "10.1",
+    "js": 1
+  },
+  "user": {
+    "uid": "456789876567897654678987656789",
+    "buyeruid": "545678765467876567898765678987654",
+    "data": [
+      {
+        "id": "6",
+        "name": "Data Provider 1",
+        "segment": [
+          {
+            "id": "12341318394918",
+            "name": "auto intenders"
+          },
+          {
+            "id": "1234131839491234",
+            "name": "auto enthusiasts"
+          }
+        ]
+      }
+    ]
+  }
+}
diff --git a/testdata/bres.multi.json b/testdata/bres.multi.json
new file mode 100644
index 0000000..3d1ea25
--- /dev/null
+++ b/testdata/bres.multi.json
@@ -0,0 +1,45 @@
+{
+  "id": "BID-4-ZIMP-4b309eae-504a-4252-a8a8-4c8ceee9791a",
+  "seatbid": [
+    {
+      "bid": [
+        {
+          "id": "24195efda36066ee21f967bc1de14c82db841f07",
+          "impid": "24195efda36066ee21f967bc1de14c82db841f07",
+          "price": 1.028428,
+          "adid": "52a12b5955314b7194a4c9ff",
+          "nurl": "http://ads.com/win/52a12b5955314b7194a4c9ff?won=${AUCTION_PRICE}",
+          "adm": "<iframe />",
+          "adomain": [
+            "ads.com"
+          ],
+          "cid": "52a12b5955314b7194a4c9ff",
+          "crid": "52a12b5955314b7194a4c9ff_1386294105",
+          "attr": [],
+          "dealid": "DX-1985-010A"
+        }
+      ],
+      "seat": "42"
+    },
+    {
+      "bid": [
+        {
+          "id": "24195efda36066ee21f967bc1de14c82db841f08",
+          "impid": "24195efda36066ee21f967bc1de14c82db841f08",
+          "price": 0.04958,
+          "adid": "527c9fdd55314ba06815f25e",
+          "nurl": "http://ads.com/win/527c9fdd55314ba06815f25e?won=${AUCTION_PRICE}",
+          "adm": "<iframe />",
+          "adomain": [
+            "ads.com"
+          ],
+          "cid": "527c9fdd55314ba06815f25e",
+          "crid": "527c9fdd55314ba06815f25e_1383899102",
+          "attr": []
+        }
+      ],
+      "seat": "772"
+    }
+  ],
+  "cur": "USD"
+}
diff --git a/testdata/bres.pmp.json b/testdata/bres.pmp.json
new file mode 100644
index 0000000..ccde324
--- /dev/null
+++ b/testdata/bres.pmp.json
@@ -0,0 +1,32 @@
+{
+  "id": "1234567890",
+  "bidid": "abc1123",
+  "cur": "USD",
+  "seatbid": [
+    {
+      "seat": "512",
+      "bid": [
+        {
+          "id": "1",
+          "impid": "102",
+          "price": 5.00,
+          "dealid": "ABC-1234-6789",
+          "nurl": "http: //adserver.com/winnotice?impid=102",
+          "adomain": [
+            "advertiserdomain.com"
+          ],
+          "iurl": "http: //adserver.com/pathtosampleimage",
+          "cid": "campaign111",
+          "crid": "creative112",
+          "adid": "314",
+          "attr": [
+            1,
+            2,
+            3,
+            4
+          ]
+        }
+      ]
+    }
+  ]
+}
diff --git a/testdata/bres.single.json b/testdata/bres.single.json
new file mode 100644
index 0000000..3be5ea7
--- /dev/null
+++ b/testdata/bres.single.json
@@ -0,0 +1,23 @@
+{
+  "id": "BID-4-ZIMP-4b309eae-504a-4252-a8a8-4c8ceee9791a",
+  "seatbid": [
+    {
+      "bid": [
+        {
+          "id": "32a69c6ba388f110487f9d1e63f77b22d86e916b",
+          "impid": "32a69c6ba388f110487f9d1e63f77b22d86e916b",
+          "price": 0.065445,
+          "adid": "529833ce55314b19e8796116",
+          "nurl": "http://ads.com/win/529833ce55314b19e8796116?won=${auction_price}",
+          "adm": "<iframe src=\"foo.bar\"/>",
+          "adomain": [],
+          "cid": "529833ce55314b19e8796116",
+          "crid": "529833ce55314b19e8796116_1385706446",
+          "attr": []
+        }
+      ],
+      "seat": "772"
+    }
+  ],
+  "cur": "USD"
+}
diff --git a/testdata/bres.vast.json b/testdata/bres.vast.json
new file mode 100644
index 0000000..6e2ffba
--- /dev/null
+++ b/testdata/bres.vast.json
@@ -0,0 +1,16 @@
+{
+  "id": "123",
+  "seatbid": [
+    {
+      "bid": [
+        {
+          "id": "12345",
+          "impid": "2",
+          "price": 3.00,
+          "nurl": "http://example.com/winnoticeurl",
+          "adm": "%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22utf-8%22%3F%3E%0A%3CVAST%20version%3D%222.0%22%3E%0A%20%20%20%20%3CAd%20id%3D%2212345%22%3E%0A%20%20%20%20%20%20%20%20%3CInLine%3E%0A%20%20%20%20%20%20%20%20%20%20%20%20%3CAdSystem%20version%3D%221.0%22%3ESpotXchange%3C%2FAdSystem%3E%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3CAdTitle%3E%3C!%5BCDATA%5BSample%20VAST%5D%5D%3E%3C%2FAdTitle%3E%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3CImpression%3Ehttp%3A%2F%2Fsample.com%3C%2FImpression%3E%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3CDescription%3E%3C!%5BCDATA%5BA%20sample%20VAST%20feed%5D%5D%3E%3C%2FDescription%3E%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3CCreatives%3E%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3CCreative%20sequence%3D%221%22%20id%3D%221%22%3E%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3CLinear%3E%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3CDuration%3E00%3A00%3A30%3C%2FDuration%3E%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3CTrackingEvents%3E%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3C%2FTrackingEvents%3E%20%20%20%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3CVideoClicks%3E%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3CClickThrough%3E%3C!%5BCDATA%5Bhttp%3A%2F%2Fsample.com%2Fopenrtbtest%5D%5D%3E%3C%2FClickThrough%3E%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3C%2FVideoClicks%3E%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3CMediaFiles%3E%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3CMediaFile%20delivery%3D%22progressive%22%20bitrate%3D%22256%22%20width%3D%22640%22%20height%3D%22480%22%20type%3D%22video%2Fmp4%22%3E%3C!%5BCDATA%5Bhttp%3A%2F%2Fsample.com%2Fvideo.mp4%5D%5D%3E%3C%2FMediaFile%3E%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3C%2FMediaFiles%3E%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3C%2FLinear%3E%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3C%2FCreative%3E%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3C%2FCreatives%3E%0A%20%20%20%20%20%20%20%20%3C%2FInLine%3E%0A%20%20%20%20%3C%2FAd%3E%0A%3C%2FVAST%3E"
+        }
+      ]
+    }
+  ]
+}
diff --git a/testdata/content.json b/testdata/content.json
new file mode 100644
index 0000000..5cc21f3
--- /dev/null
+++ b/testdata/content.json
@@ -0,0 +1,9 @@
+{
+  "id": "1",
+  "title": "Video",
+  "producer": {
+    "id": "agltb3B1Yi1pbmNyDAsSA0FwcBiJkfTUCV",
+    "name": "yahoo",
+    "domain": "www.yahoo.com"
+  }
+}
diff --git a/testdata/device.json b/testdata/device.json
new file mode 100644
index 0000000..0794ab9
--- /dev/null
+++ b/testdata/device.json
@@ -0,0 +1,25 @@
+{
+  "dnt": 0,
+  "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": {
+    "country": "USA",
+    "lat": 35.012345,
+    "lon": -115.12345,
+    "city": "Los Angeles",
+    "metro": "803",
+    "region": "CA",
+    "zip": "90049"
+  },
+  "dpidsha1": "AA000DFE74168477C70D291f574D344790E0BB11",
+  "dpidmd5": "AA003EABFB29E6F759F3BDAB34E50BB11",
+  "carrier": "310-410",
+  "language": "en",
+  "make": "Apple",
+  "model": "iPhone",
+  "os": "iOS",
+  "osv": "6.1",
+  "js": 1,
+  "connectiontype": 3,
+  "devicetype": 1
+}
diff --git a/testdata/impression.json b/testdata/impression.json
new file mode 100644
index 0000000..a66434d
--- /dev/null
+++ b/testdata/impression.json
@@ -0,0 +1,19 @@
+{
+  "id": "1",
+  "banner": {
+    "h": 250,
+    "w": 300,
+    "pos": 0
+  },
+  "bidfloor": 0.03,
+  "pmp": {
+    "private_auction": 1,
+    "deals": [
+      {
+        "id": "DX-1985-010A",
+        "bidfloor": 2.5,
+        "at": 2
+      }
+    ]
+  }
+}
diff --git a/testdata/native.json b/testdata/native.json
new file mode 100644
index 0000000..8be5cde
--- /dev/null
+++ b/testdata/native.json
@@ -0,0 +1,4 @@
+{
+  "request": "PAYLOAD",
+  "ver": "2"
+}
diff --git a/testdata/pmp.json b/testdata/pmp.json
new file mode 100644
index 0000000..695ebd6
--- /dev/null
+++ b/testdata/pmp.json
@@ -0,0 +1,14 @@
+{
+  "private_auction": 1,
+  "deals": [
+    {
+      "id": "DX-1985-010A",
+      "bidfloor": 2.5,
+      "at": 2
+    },
+    {
+      "id": "DX-1986-010A",
+      "bidfloor": 2.6
+    }
+  ]
+}
diff --git a/testdata/site.json b/testdata/site.json
new file mode 100644
index 0000000..3b52784
--- /dev/null
+++ b/testdata/site.json
@@ -0,0 +1,13 @@
+{
+  "id": "102855",
+  "domain": "http://www.usabarfinder.com",
+  "cat": [
+    "IAB3-1"
+  ],
+  "page": "http://eas.usabarfinder.com/eas?cu=13824;cre=mu;target=_blank",
+  "publisher": {
+    "id": "8953",
+    "name": "local.com",
+    "domain": "local.com"
+  }
+}
diff --git a/testdata/video.json b/testdata/video.json
new file mode 100644
index 0000000..47ef229
--- /dev/null
+++ b/testdata/video.json
@@ -0,0 +1,68 @@
+{
+  "w": 640,
+  "h": 480,
+  "pos": 1,
+  "startdelay": 0,
+  "minduration": 5,
+  "maxduration": 30,
+  "maxextended": 30,
+  "minbitrate": 300,
+  "maxbitrate": 1500,
+  "api": [
+    1,
+    2
+  ],
+  "protocols": [
+    2,
+    3
+  ],
+  "mimes": [
+    "video/x-flv",
+    "video/mp4",
+    "application/x-shockwave-flash",
+    "application/javascript"
+  ],
+  "linearity": 1,
+  "boxingallowed": 1,
+  "playbackmethod": [
+    1,
+    3
+  ],
+  "delivery": [
+    2
+  ],
+  "battr": [
+    13,
+    14
+  ],
+  "companionad": [
+    {
+      "id": "1234567893-1",
+      "w": 300,
+      "h": 250,
+      "pos": 1,
+      "battr": [
+        13,
+        14
+      ],
+      "expdir": [
+        2,
+        4
+      ]
+    },
+    {
+      "id": "1234567893-2",
+      "w": 728,
+      "h": 90,
+      "pos": 1,
+      "battr": [
+        13,
+        14
+      ]
+    }
+  ],
+  "companiontype": [
+    1,
+    2
+  ]
+}
diff --git a/video.go b/video.go
index 5f28dc6..b56fa58 100644
--- a/video.go
+++ b/video.go
@@ -1,131 +1,98 @@
 package openrtb
 
 import (
+	"encoding/json"
 	"errors"
 )
 
+// Validation errors
+var (
+	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
 // 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
-	Protocol       interface{} `json:"protocol,omitempty"`       // Video bid response protocols - use interface{} to cater for nonconformant exchanges
-	Protocols      []int       `json:"protocols,omitempty"`      // Video bid response protocols
-	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
-	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"`
-	Ext            Extensions  `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      []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"`
+	Ext            Extension `json:"ext,omitempty"`
 }
 
-// Returns the sequence number, with default fallback
-func (v *Video) Seq() int {
-	if v.Sequence != nil {
-		return *v.Sequence
-	}
-	return 1
-}
-
-// Returns the boxing permission status, with default fallback
-func (v *Video) IsBoxingAllowed() bool {
-	if v.Boxingallowed != nil {
-		return *v.Boxingallowed == 1
-	}
-	return true
-}
-
-// Returns the position, with default fallback
-func (v *Video) Position() int {
-	if v.Pos != nil {
-		return *v.Pos
-	}
-	return AD_POS_UNKNOWN
-}
-
-// Validation errors
-var (
-	ErrInvalidVideoMimes       = errors.New("openrtb parse: video has no mimes")
-	ErrInvalidVideoLinearity   = errors.New("openrtb parse: video linearity missing")
-	ErrInvalidVideoMinduration = errors.New("openrtb parse: video minduration missing")
-	ErrInvalidVideoMaxduration = errors.New("openrtb parse: video maxduration missing")
-	ErrInvalidVideoProtocol    = errors.New("openrtb parse: video protocol missing")
-)
+type jsonVideo Video
 
 // Validates the object
-func (v *Video) Valid() (bool, error) {
+func (v *Video) Validate() error {
 	if len(v.Mimes) == 0 {
-		return false, ErrInvalidVideoMimes
-	} else if v.Linearity == nil {
-		return false, ErrInvalidVideoLinearity
-	} else if v.Minduration == nil {
-		return false, ErrInvalidVideoMinduration
-	} else if v.Maxduration == nil {
-		return false, ErrInvalidVideoMaxduration
-	} else if v.Protocol == nil {
-		return false, ErrInvalidVideoProtocol
+		return ErrInvalidVideoNoMimes
+	} else if v.Linearity == 0 {
+		return ErrInvalidVideoNoLinearity
+	} else if v.MinDuration == 0 {
+		return ErrInvalidVideoNoMinDuration
+	} else if v.MaxDuration == 0 {
+		return ErrInvalidVideoNoMaxDuration
+	} else if v.Protocol == 0 && len(v.Protocols) == 0 {
+		return ErrInvalidVideoNoProtocols
 	}
-	return true, nil
+	return nil
 }
 
-// Applies defaults
-func (v *Video) WithDefaults() *Video {
-	if v.Sequence == nil {
-		v.Sequence = new(int)
-		*v.Sequence = 1
-	}
-	if v.Boxingallowed == nil {
-		v.Boxingallowed = new(int)
-		*v.Boxingallowed = 1
-	}
-	if v.Pos == nil {
-		v.Pos = new(int)
-		*v.Pos = AD_POS_UNKNOWN
+// GetBoxingAllowed returns the boxing-allowed indicator
+func (v *Video) GetBoxingAllowed() int {
+	if v.BoxingAllowed != nil {
+		return *v.BoxingAllowed
 	}
-	return v
+	return 1
 }
 
-// Set the Linearity
-func (v *Video) SetLinearity(lin int) *Video {
-	if v.Linearity == nil {
-		v.Linearity = new(int)
-	}
-	*v.Linearity = lin
-	return v
+// MarshalJSON custom marshalling with normalization
+func (v *Video) MarshalJSON() ([]byte, error) {
+	v.normalize()
+	return json.Marshal((*jsonVideo)(v))
 }
 
-// Set the Minduration
-func (v *Video) SetMinduration(mdur int) *Video {
-	if v.Minduration == nil {
-		v.Minduration = new(int)
+// UnmarshalJSON custom unmarshalling with normalization
+func (v *Video) UnmarshalJSON(data []byte) error {
+	var h jsonVideo
+	if err := json.Unmarshal(data, &h); err != nil {
+		return err
 	}
-	*v.Minduration = mdur
-	return v
-}
 
-// Set the Maxduration
-func (v *Video) SetMaxduration(mdur int) *Video {
-	if v.Maxduration == nil {
-		v.Maxduration = new(int)
-	}
-	*v.Maxduration = mdur
-	return v
+	*v = (Video)(h)
+	v.normalize()
+	return nil
 }
 
-// Set the Protocol
-func (v *Video) SetProtocol(p int) *Video {
-	v.Protocol = p
-	return v
+func (v *Video) normalize() {
+	if v.Sequence == 0 {
+		v.Sequence = 1
+	}
+	if v.Linearity == 0 {
+		v.Linearity = VideoLinearityLinear
+	}
 }
diff --git a/video_test.go b/video_test.go
index fff5cf6..124aa71 100644
--- a/video_test.go
+++ b/video_test.go
@@ -8,68 +8,70 @@ import (
 var _ = Describe("Video", func() {
 	var subject *Video
 
-  BeforeEach(func() { subject = new(Video) })
-
-  Describe("Seq()", func() {
-    It("should return '1' as default", func() {
-      Expect(subject.Seq()).To(Equal(1))
-    })
-  })
-
-  Describe("IsBoxingAllowed()", func() {
-    It("should return true as default", func() {
-      Expect(subject.IsBoxingAllowed()).To(BeTrue())
-    })
-
-    It("should return false when set as false", func() {
-      subject.Boxingallowed = new(int)
-      *subject.Boxingallowed = 0
-      Expect(subject.IsBoxingAllowed()).To(BeFalse())
-    })
-  })
-
-  Describe("Position()", func() {
-    It("should return 0/AD_POST_UNKNOWN as default", func() {
-      Expect(subject.Position()).To(Equal(0))
-    })
-  })
-
-  Describe("Valid()", func() {
-    It("should return error messages when attributes missing", func() {
-    	ok, err := subject.Valid()
-			Expect(err.Error()).To(Equal("openrtb parse: video has no mimes"))
-
-      subject.Mimes  = []string{"RAND_KEY"} // With Mimes
-    	ok, err = subject.Valid()
-			Expect(err.Error()).To(Equal("openrtb parse: video linearity missing"))
-
-	  	subject.SetLinearity(2)   // With Linearity
-    	ok, err = subject.Valid()
-			Expect(err.Error()).To(Equal("openrtb parse: video minduration missing"))
-
-	  	subject.SetMinduration(1) // With Minduration
-    	ok, err = subject.Valid()
-			Expect(err.Error()).To(Equal("openrtb parse: video maxduration missing"))
-
-	  	subject.SetMaxduration(5) // With Maxduration
-    	ok, err = subject.Valid()
-			Expect(err.Error()).To(Equal("openrtb parse: video protocol missing"))
-
-	  	subject.SetProtocol(1)   // With Protocol
-      ok, err = subject.Valid()
-      Expect(err).NotTo(HaveOccurred())
-    	Expect(ok).To(BeTrue())
-    })
-  })
-
-  Describe("WithDefaults()", func() {
-
-    It("should return object with default values", func() {
-      subject.WithDefaults()
-      Expect(*subject.Sequence).To(Equal(1))
-      Expect(*subject.Boxingallowed).To(Equal(1))
-      Expect(*subject.Pos).To(Equal(AD_POS_UNKNOWN))
-    })
-  })
-
-})
\ No newline at end of file
+	BeforeEach(func() {
+		err := fixture("video", &subject)
+		Expect(err).NotTo(HaveOccurred())
+	})
+
+	It("should parse correctly", func() {
+		Expect(subject).To(Equal(&Video{
+			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{13, 14},
+			MaxExtended:    30,
+			MinBitrate:     300,
+			MaxBitrate:     1500,
+			BoxingAllowed:  iptr(1),
+			PlaybackMethod: []int{VideoPlaybackAutoSoundOn, VideoPlaybackClickToPlay},
+			Delivery:       []int{2},
+			Pos:            AdPosAboveFold,
+			CompanionAd: []Banner{
+				{W: 300, H: 250, ID: "1234567893-1", Pos: 1, BAttr: []int{13, 14}, ExpDir: []int{ExpDirRight, ExpDirDown}},
+				{W: 728, H: 90, ID: "1234567893-2", Pos: 1, BAttr: []int{13, 14}},
+			},
+			Api:           []int{1, 2},
+			CompanionType: []int{1, 2},
+		}))
+	})
+
+	It("should validate", func() {
+		Expect((&Video{}).Validate()).To(Equal(ErrInvalidVideoNoMimes))
+		Expect((&Video{
+			Mimes: []string{"video/mp4"},
+		}).Validate()).To(Equal(ErrInvalidVideoNoLinearity))
+		Expect((&Video{
+			Linearity: VideoLinearityNonLinear,
+			Mimes:     []string{"video/mp4"},
+		}).Validate()).To(Equal(ErrInvalidVideoNoMinDuration))
+		Expect((&Video{
+			MinDuration: 1,
+			Linearity:   VideoLinearityNonLinear,
+			Mimes:       []string{"video/mp4"},
+		}).Validate()).To(Equal(ErrInvalidVideoNoMaxDuration))
+		Expect((&Video{
+			MinDuration: 1,
+			MaxDuration: 1,
+			Linearity:   VideoLinearityNonLinear,
+			Mimes:       []string{"video/mp4"},
+		}).Validate()).To(Equal(ErrInvalidVideoNoProtocols))
+		Expect((&Video{
+			Protocol:    VideoProtoVAST3,
+			MinDuration: 1,
+			MaxDuration: 1,
+			Linearity:   VideoLinearityNonLinear,
+			Mimes:       []string{"video/mp4"},
+		}).Validate()).NotTo(HaveOccurred())
+	})
+
+})