diff --git a/app/account.go b/app/account.go
index 129a1ad..2423372 100644
--- a/app/account.go
+++ b/app/account.go
@@ -20,13 +20,11 @@ type AccountActivityWrapper struct {
 	CannabisCustomer         bool
 	CompanyID                string
 	CoordinateID             string
-	Coordinate               Coordinate
 	CustomerID               string
 	CustomerPriority         string
 	DBA                      string
 	DefaultAddress           Address
 	DefaultBackendID         string
-	DefaultBackend           Backend
 	DefaultDeliveryContactID string
 	DefaultDeliveryContact   string
 	DefaultEndUserID         string
@@ -73,6 +71,7 @@ type Account struct {
 	Balance                  float64
 	BillingAddress           *Address
 	BillingContactID         string
+	BillingContact           *Contact
 	BillingPreference        string
 	BusinessAddress          *Address
 	CannabisCustomer         bool
@@ -81,6 +80,7 @@ type Account struct {
 	ClientEndDate            sql.NullTime
 	ClientStartDate          sql.NullTime
 	CompanyID                string
+	Coordinate               *Coordinate
 	CoordinateID             string
 	CreatedByID              string
 	CreatedDate              sql.NullTime
@@ -90,6 +90,7 @@ type Account struct {
 	DBA                      string
 	DefaultAddress           *Address
 	DefaultBackendID         string
+	DefaultBackend           *Backend
 	DefaultDeliveryContactID string
 	DefaultEndUserID         string
 	Description              string
@@ -113,6 +114,7 @@ type Account struct {
 	NumberOfLocations        int64
 	OpenCharges              float64
 	OrderContactID           string
+	OrderContact             *Contact
 	OrderEmail               string
 	OwnerID                  string
 	Ownership                string
@@ -130,6 +132,7 @@ type Account struct {
 	ShippingAddress          *Address
 	ShippingCensusTract      string
 	ShippingContactID        string
+	ShippingContact          *Contact
 	ShippingCounty           string
 	SIC                      string
 	SicDesc                  string