Disabled redis when generating static yaml resources except core (#1099 )

* Disabled redis when generating static yaml resources except core * mitigate cloudbuild error
Release 0.9 (#1098 )
2025-04-02 16:28:06 +00:00 · 2020-02-03 18:32:57 -08:00 · 2020-02-03 16:28:18 -08:00
311 changed files with 11786 additions and 37006 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@ -1 +0,0 @@
-* @laremere @aLekSer @HazWard @calebatwd @syntxerror @sawagh @andrewgrundy
--- a/.github/ISSUE_TEMPLATE/release.md
+++ b/.github/ISSUE_TEMPLATE/release.md
@ -114,6 +114,7 @@ git push origin release-0.5
 - [ ] There might be additional references to the old version but be careful not to change it for places that have it for historical purposes.
 - [ ] Run `make release`
 - [ ] Run `make api/api.md` in open-match repo to update the auto-generated API references in open-match-docs repo.
+- [ ] Use the files under the `build/release/` directory for the Open Match installation guide. Make sure the artifacts work as expected - these are the artifacts that will be published to the GCS bucket and used in our release assets.
 - [ ] Create a PR with the changes, include the release candidate name, and point it to the release branch.
 - [ ] Go to [open-match-build](https://pantheon.corp.google.com/cloud-build/triggers?project=open-match-build) and update all *post submit* triggers' `_GCB_LATEST_VERSION` value to the `X.Y` of the release. This value should only increase as it's used to determine the latest stable version.
 - [ ] Merge your changes once the PR is approved.
@ -151,7 +152,6 @@ only required once.**
 - [ ] Go to the History section and find the "Post Submit" build of the merged commit that's running. Wait for it to go Green. If it's red, fix error repeat this section. Take note of the docker image version tag for next step. Example: 0.5.0-a4706cb.
 - [ ] Run `./docs/governance/templates/release.sh {source version tag} {version}` to copy the images to open-match-public-images.
 - [ ] If this is a new minor version in the newest major version then run `./docs/governance/templates/release.sh {source version tag} latest`.
- [ ] Use the files under the `build/release/` directory for the Open Match installation guide. Make sure the artifacts work as expected - these are the artifacts that will be published to the GCS bucket and used in our release assets.
 - [ ] Copy the files from `build/release/` generated from `make release` to the release draft you created.  You can drag and drop the files using the Github UI.
 - [ ] Update [Slack invitation link](https://slack.com/help/articles/201330256-invite-new-members-to-your-workspace#share-an-invite-link) in [open-match.dev](https://open-match.dev/site/docs/contribute/#get-involved).
 - [ ] Test Open Match installation under GKE and Minikube enviroment using YAML files and Helm. Follow the [First Match](https://development.open-match.dev/site/docs/getting-started/first_match/) guide, run `make proxy-demo`, and open `localhost:51507` to make sure everything works.
@ -165,7 +165,6 @@ only required once.**
 - [ ] Save the release as a draft.
 - [ ] Circulate the draft release to active contributors.  Where reasonable, get everyone's ok on the release notes before continuing.
 - [ ] Publish the [Release](om-release) in Github.  This will notify repository watchers.
- [ ] Publish the [Release](om-release) on Open Match [Blog](https://open-match.dev/site/blog/).

 ## Announce

--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@ -1,16 +0,0 @@
-<!--  Thanks for sending a pull request!  Here are some tips for you:
-If this is your first time, please read our contributor guidelines: https://github.com/googleforgames/open-match/blob/master/CONTRIBUTING.md and developer guide https://github.com/googleforgames/open-match/blob/master/docs/development.md
-->
-
-**What this PR does / Why we need it**:
-
-**Which issue(s) this PR fixes**:
-<!--
-*Automatically closes linked issue when PR is merged.
-Usage: `Closes #<issue number>`, or `Closes (paste link of issue)`.
-->
-Closes #
-
-**Special notes for your reviewer**:
-
-
--- a/.golangci.yaml
+++ b/.golangci.yaml
@ -171,10 +171,17 @@ linters:
    - funlen
    - gochecknoglobals
    - goconst
+    - gocritic
    - gocyclo
+    - gofmt
+    - goimports
    - gosec
    - interfacer # deprecated - "A tool that suggests interfaces is prone to bad suggestions"
    - lll
+    - prealloc
+    - scopelint
+    - staticcheck
+    - stylecheck

 #linters:
 #  enable-all: true
--- a/Dockerfile.base-build
+++ b/Dockerfile.base-build
@ -13,7 +13,7 @@
 # limitations under the License.

 # When updating Go version, update Dockerfile.ci, Dockerfile.base-build, and go.mod
-FROM golang:1.14.0
+FROM golang:1.13.4
 ENV GO111MODULE=on

 WORKDIR /go/src/open-match.dev/open-match
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@ -34,13 +34,13 @@ RUN export CLOUD_SDK_REPO="cloud-sdk-stretch" && \
    apt-get update -y && apt-get install google-cloud-sdk google-cloud-sdk-app-engine-go -y -qq

 # Install Golang
-# https://github.com/docker-library/golang/blob/master/1.14/stretch/Dockerfile
+# https://github.com/docker-library/golang/blob/master/1.13/stretch/Dockerfile
 RUN mkdir -p /toolchain/golang
 WORKDIR /toolchain/golang
 RUN sudo rm -rf /usr/local/go/

 # When updating Go version, update Dockerfile.ci, Dockerfile.base-build, and go.mod
-RUN curl -L https://golang.org/dl/go1.14.linux-amd64.tar.gz | sudo tar -C /usr/local -xz
+RUN curl -L https://golang.org/dl/go1.13.4.linux-amd64.tar.gz | sudo tar -C /usr/local -xz

 ENV GOPATH /go
 ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
--- a/315
+++ b/315
@ -15,45 +15,44 @@
 ## Open Match Make Help
 ## ====================
 ##
-## # Create a GKE Cluster (requires gcloud installed and initialized, https://cloud.google.com/sdk/docs/quickstarts)
+## Create a GKE Cluster (requires gcloud installed and initialized, https://cloud.google.com/sdk/docs/quickstarts)
 ## make activate-gcp-apis
 ## make create-gke-cluster push-helm
 ##
-## # Create a Minikube Cluster (requires VirtualBox)
+## Create a Minikube Cluster (requires VirtualBox)
 ## make create-mini-cluster push-helm
 ##
-## # Create a KinD Cluster (Follow instructions to run command before pushing helm.)
+## Create a KinD Cluster (Follow instructions to run command before pushing helm.)
 ## make create-kind-cluster get-kind-kubeconfig
-##
-## # Finish KinD setup by installing helm:
+## Finish KinD setup by installing helm:
 ## make push-helm
 ##
-## # Deploy Open Match
+## Deploy Open Match
 ## make push-images -j$(nproc)
 ## make install-chart
 ##
-## # Build and Test
+## Build and Test
 ## make all -j$(nproc)
 ## make test
 ##
-## # Access telemetry
+## Access telemetry
 ## make proxy-prometheus
 ## make proxy-grafana
 ## make proxy-ui
 ##
-## # Teardown
+## Teardown
 ## make delete-mini-cluster
 ## make delete-gke-cluster
 ## make delete-kind-cluster && export KUBECONFIG=""
 ##
-## # Prepare a Pull Request
+## Prepare a Pull Request
 ## make presubmit
 ##

 # If you want information on how to edit this file checkout,
 # http://makefiletutorial.com/

-BASE_VERSION = 1.3.0-rc.1
+BASE_VERSION = 0.9.0
 SHORT_SHA = $(shell git rev-parse --short=7 HEAD | tr -d [:punct:])
 BRANCH_NAME = $(shell git rev-parse --abbrev-ref HEAD | tr -d [:punct:])
 VERSION = $(BASE_VERSION)-$(SHORT_SHA)
@ -68,8 +67,6 @@ MINIKUBE_VERSION = latest
 GOLANGCI_VERSION = 1.18.0
 KIND_VERSION = 0.5.1
 SWAGGERUI_VERSION = 3.24.2
-GOOGLE_APIS_VERSION = aba342359b6743353195ca53f944fe71e6fb6cd4
-GRPC_GATEWAY_VERSION = 2.3.0
 TERRAFORM_VERSION = 0.12.13
 CHART_TESTING_VERSION = 2.4.0

@ -80,6 +77,7 @@ ENABLE_SECURITY_HARDENING = 0
 GO = GO111MODULE=on go
 # Defines the absolute local directory of the open-match project
 REPOSITORY_ROOT := $(patsubst %/,%,$(dir $(abspath $(MAKEFILE_LIST))))
+GO_BUILD_COMMAND = CGO_ENABLED=0 $(GO) build -a -installsuffix cgo .
 BUILD_DIR = $(REPOSITORY_ROOT)/build
 TOOLCHAIN_DIR = $(BUILD_DIR)/toolchain
 TOOLCHAIN_BIN = $(TOOLCHAIN_DIR)/bin
@ -124,7 +122,7 @@ GCLOUD = gcloud --quiet
 OPEN_MATCH_HELM_NAME = open-match
 OPEN_MATCH_KUBERNETES_NAMESPACE = open-match
 OPEN_MATCH_SECRETS_DIR = $(REPOSITORY_ROOT)/install/helm/open-match/secrets
-GCLOUD_ACCOUNT_EMAIL = $(shell gcloud auth list --format yaml | grep ACTIVE -a2 | grep account: | cut -c 10-)
+GCLOUD_ACCOUNT_EMAIL = $(shell gcloud auth list --format yaml | grep account: | cut -c 10-)
 _GCB_POST_SUBMIT ?= 0
 # Latest version triggers builds of :latest images.
 _GCB_LATEST_VERSION ?= undefined
@ -188,7 +186,7 @@ else
 	endif
 endif

-GOLANG_PROTOS = pkg/pb/backend.pb.go pkg/pb/frontend.pb.go pkg/pb/matchfunction.pb.go pkg/pb/query.pb.go pkg/pb/messages.pb.go pkg/pb/extensions.pb.go pkg/pb/evaluator.pb.go internal/ipb/synchronizer.pb.go internal/ipb/messages.pb.go pkg/pb/backend.pb.gw.go pkg/pb/frontend.pb.gw.go pkg/pb/matchfunction.pb.gw.go pkg/pb/query.pb.gw.go pkg/pb/evaluator.pb.gw.go
+GOLANG_PROTOS = pkg/pb/backend.pb.go pkg/pb/frontend.pb.go pkg/pb/matchfunction.pb.go pkg/pb/query.pb.go pkg/pb/messages.pb.go pkg/pb/extensions.pb.go pkg/pb/evaluator.pb.go internal/ipb/synchronizer.pb.go pkg/pb/backend.pb.gw.go pkg/pb/frontend.pb.gw.go pkg/pb/matchfunction.pb.gw.go pkg/pb/query.pb.gw.go pkg/pb/evaluator.pb.gw.go

 SWAGGER_JSON_DOCS = api/frontend.swagger.json api/backend.swagger.json api/query.swagger.json api/matchfunction.swagger.json api/evaluator.swagger.json

@ -198,7 +196,7 @@ ALL_PROTOS = $(GOLANG_PROTOS) $(SWAGGER_JSON_DOCS)
 CMDS = $(notdir $(wildcard cmd/*))

 # Names of the individual images, ommiting the openmatch prefix.
-IMAGES = $(CMDS) mmf-go-soloduel mmf-go-backfill base-build
+IMAGES = $(CMDS) mmf-go-soloduel mmf-go-pool evaluator-go-simple base-build

 help:
 	@cat Makefile | grep ^\#\# | grep -v ^\#\#\# |cut -c 4-
@ -210,18 +208,14 @@ local-cloud-build: gcloud
 ################################################################################
 ## #############################################################################
 ## Image commands:
-## These commands are auto-generated based on a complete list of images.
-## All folders in cmd/ are turned into an image using Dockerfile.cmd.
-## Additional images are specified by the IMAGES variable.
-## Image commands ommit the "openmatch-" prefix on the image name and tags.
+## These commands are auto-generated based on a complete list of images.  All
+## folders in cmd/ are turned into an image using Dockerfile.cmd.  Additional
+## images are specified by the IMAGES variable.  Image commands ommit the
+## "openmatch-" prefix on the image name and tags.
 ##

-list-images:
-	@echo $(IMAGES)
-
 #######################################
-## # Builds images locally
-## build-images / build-<image name>-image
+## build-images / build-<image name>-image: builds images locally
 ##
 build-images: $(foreach IMAGE,$(IMAGES),build-$(IMAGE)-image)

@ -242,12 +236,15 @@ $(foreach CMD,$(CMDS),build-$(CMD)-image): build-%-image: docker build-base-buil
 build-mmf-go-soloduel-image: docker build-base-build-image
 	docker build -f examples/functions/golang/soloduel/Dockerfile -t $(REGISTRY)/openmatch-mmf-go-soloduel:$(TAG) -t $(REGISTRY)/openmatch-mmf-go-soloduel:$(ALTERNATE_TAG) .

-build-mmf-go-backfill-image: docker build-base-build-image
-	docker build -f examples/functions/golang/backfill/Dockerfile -t $(REGISTRY)/openmatch-mmf-go-backfill:$(TAG) -t $(REGISTRY)/openmatch-mmf-go-backfill:$(ALTERNATE_TAG) .
+build-mmf-go-pool-image: docker build-base-build-image
+	docker build -f test/matchfunction/Dockerfile -t $(REGISTRY)/openmatch-mmf-go-pool:$(TAG) -t $(REGISTRY)/openmatch-mmf-go-pool:$(ALTERNATE_TAG) .
+
+build-evaluator-go-simple-image: docker build-base-build-image
+	docker build -f test/evaluator/Dockerfile -t $(REGISTRY)/openmatch-evaluator-go-simple:$(TAG) -t $(REGISTRY)/openmatch-evaluator-go-simple:$(ALTERNATE_TAG) .

 #######################################
-## # Builds and pushes images to your container registry.
-## push-images / push-<image name>-image
+## push-images / push-<image name>-image: builds and pushes images to your
+## container registry.
 ##
 push-images: $(foreach IMAGE,$(IMAGES),push-$(IMAGE)-image)

@ -266,9 +263,8 @@ endif
 endif

 #######################################
-## # Publishes images on the public container registry.
-## # Used for publishing releases.
-## retag-images / retag-<image name>-image
+## retag-images / retag-<image name>-image: publishes images on the public
+## container registry.  Used for publishing releases.
 ##
 retag-images: $(foreach IMAGE,$(IMAGES),retag-$(IMAGE)-image)

@ -281,8 +277,7 @@ $(foreach IMAGE,$(IMAGES),retag-$(IMAGE)-image): retag-%-image: docker
 	docker push $(TARGET_REGISTRY)/openmatch-$*:$(TAG)

 #######################################
-## # Removes images from local docker
-## clean-images / clean-<image name>-image
+## clean-images / clean-<image name>-image: removes images from local docker
 ##
 clean-images: docker $(foreach IMAGE,$(IMAGES),clean-$(IMAGE)-image)
 	-docker rmi -f open-match-base-build
@ -292,7 +287,7 @@ $(foreach IMAGE,$(IMAGES),clean-$(IMAGE)-image): clean-%-image:

 #####################################################################################################################
 update-chart-deps: build/toolchain/bin/helm$(EXE_EXTENSION)
-	(cd $(REPOSITORY_ROOT)/install/helm/open-match; $(HELM) repo add incubator https://charts.helm.sh/incubator; $(HELM) repo add bitnami https://charts.bitnami.com/bitnami;$(HELM) dependency update)
+	(cd $(REPOSITORY_ROOT)/install/helm/open-match; $(HELM) repo add incubator https://kubernetes-charts-incubator.storage.googleapis.com; $(HELM) dependency update)

 lint-chart: build/toolchain/bin/helm$(EXE_EXTENSION) build/toolchain/bin/ct$(EXE_EXTENSION)
 	(cd $(REPOSITORY_ROOT)/install/helm; $(HELM) lint $(OPEN_MATCH_HELM_NAME))
@ -305,8 +300,8 @@ build/chart/open-match-$(BASE_VERSION).tgz: build/toolchain/bin/helm$(EXE_EXTENS

 build/chart/index.yaml: build/toolchain/bin/helm$(EXE_EXTENSION) gcloud build/chart/open-match-$(BASE_VERSION).tgz
 	mkdir -p $(BUILD_DIR)/chart-index/
-	-gsutil cp $(_CHARTS_BUCKET)/chart/index.yaml $(BUILD_DIR)/chart-index/
-	-gsutil -m cp $(_CHARTS_BUCKET)/chart/open-match-* $(BUILD_DIR)/chart-index/
+	-gsutil cp gs://open-match-chart/chart/index.yaml $(BUILD_DIR)/chart-index/
+	-gsutil -m cp gs://open-match-chart/chart/open-match-* $(BUILD_DIR)/chart-index/
 	$(HELM) repo index $(BUILD_DIR)/chart-index/
 	$(HELM) repo index --merge $(BUILD_DIR)/chart-index/index.yaml $(BUILD_DIR)/chart/

@ -320,7 +315,7 @@ install-chart-prerequisite: build/toolchain/bin/kubectl$(EXE_EXTENSION) update-c
 	$(KUBECTL) apply -f install/gke-metadata-server-workaround.yaml

 # Used for Open Match development. Install om-configmap-override.yaml by default.
-HELM_UPGRADE_FLAGS = --cleanup-on-fail -i --no-hooks --debug --timeout=600s --namespace=$(OPEN_MATCH_KUBERNETES_NAMESPACE) --set global.gcpProjectId=$(GCP_PROJECT_ID) --set open-match-override.enabled=true --set redis.password=$(REDIS_DEV_PASSWORD) --set redis.usePassword=false --set redis.sentinel.usePassword=false
+HELM_UPGRADE_FLAGS = --cleanup-on-fail -i --no-hooks --debug --timeout=600s --namespace=$(OPEN_MATCH_KUBERNETES_NAMESPACE) --set global.gcpProjectId=$(GCP_PROJECT_ID) --set open-match-override.enabled=true --set redis.password=$(REDIS_DEV_PASSWORD)
 # Used for generate static yamls. Install om-configmap-override.yaml as needed.
 HELM_TEMPLATE_FLAGS = --no-hooks --namespace $(OPEN_MATCH_KUBERNETES_NAMESPACE) --set usingHelmTemplate=true
 HELM_IMAGE_FLAGS = --set global.image.registry=$(REGISTRY) --set global.image.tag=$(TAG)
@ -364,24 +359,17 @@ install-scale-chart: install-chart-prerequisite build/toolchain/bin/helm$(EXE_EX
 		--set open-match-core.redis.enabled=false \
 		--set global.telemetry.prometheus.enabled=true \
 		--set global.telemetry.grafana.enabled=true \
-		--set global.kubernetes.serviceAccount=$(OPEN_MATCH_HELM_NAME)-unprivileged-service \
-		--set open-match-scale.enabled=true \
- 		--set open-match-scale.configs.default.configName="\{\{ printf \"$(OPEN_MATCH_HELM_NAME)-configmap-default\" \}\}" \
- 		--set open-match-scale.configs.override.configName="\{\{ printf \"$(OPEN_MATCH_HELM_NAME)-configmap-override\" \}\}" | $(KUBECTL) apply -f -
+		--set open-match-scale.enabled=true | $(KUBECTL) apply -f -

 # install-ci-chart will install open-match-core with pool based mmf for end-to-end in-cluster test.
 install-ci-chart: install-chart-prerequisite build/toolchain/bin/helm$(EXE_EXTENSION) install/helm/open-match/secrets/
 	$(HELM) upgrade $(OPEN_MATCH_HELM_NAME) $(HELM_UPGRADE_FLAGS) --atomic install/helm/open-match $(HELM_IMAGE_FLAGS) \
-		--set query.replicas=1,frontend.replicas=1,backend.replicas=1 \
-		--set evaluator.hostName=open-match-test \
-		--set evaluator.grpcPort=50509 \
-		--set evaluator.httpPort=51509 \
-		--set open-match-core.registrationInterval=200ms \
-		--set open-match-core.proposalCollectionInterval=200ms \
-		--set open-match-core.assignedDeleteTimeout=200ms \
-		--set open-match-core.pendingReleaseTimeout=1s \
-		--set open-match-core.queryPageSize=10 \
-		--set global.gcpProjectId=intentionally-invalid-value \
+		--set open-match-core.ignoreListTTL=500ms \
+		--set open-match-customize.enabled=true \
+		--set open-match-customize.function.enabled=true \
+		--set open-match-customize.evaluator.enabled=true \
+		--set open-match-customize.function.image=openmatch-mmf-go-pool \
+		--set query.replicas=1,frontend.replicas=1,backend.replicas=1,open-match-customize.evaluator.replicas=1,open-match-customize.function.replicas=1 \
 		--set redis.master.resources.requests.cpu=0.6,redis.master.resources.requests.memory=300Mi \
 		--set ci=true

@ -393,18 +381,11 @@ delete-chart: build/toolchain/bin/helm$(EXE_EXTENSION) build/toolchain/bin/kubec
 	-$(KUBECTL) delete namespace $(OPEN_MATCH_KUBERNETES_NAMESPACE)
 	-$(KUBECTL) delete namespace $(OPEN_MATCH_KUBERNETES_NAMESPACE)-demo

-ifneq ($(BASE_VERSION), 0.0.0-dev)
-install/yaml/: REGISTRY = gcr.io/$(OPEN_MATCH_PUBLIC_IMAGES_PROJECT_ID)
-install/yaml/: TAG = $(BASE_VERSION)
-endif
 install/yaml/: update-chart-deps install/yaml/install.yaml install/yaml/01-open-match-core.yaml install/yaml/02-open-match-demo.yaml install/yaml/03-prometheus-chart.yaml install/yaml/04-grafana-chart.yaml install/yaml/05-jaeger-chart.yaml install/yaml/06-open-match-override-configmap.yaml install/yaml/07-open-match-default-evaluator.yaml

-# We have to hard-code the Jaeger endpoints as we are excluding Jaeger, so Helm cannot determine the endpoints from the Jaeger subchart
 install/yaml/01-open-match-core.yaml: build/toolchain/bin/helm$(EXE_EXTENSION)
 	mkdir -p install/yaml/
 	$(HELM) template $(OPEN_MATCH_HELM_NAME) $(HELM_TEMPLATE_FLAGS) $(HELM_IMAGE_FLAGS) \
-		--set-string global.telemetry.jaeger.agentEndpoint="$(OPEN_MATCH_HELM_NAME)-jaeger-agent:6831" \
-		--set-string global.telemetry.jaeger.collectorEndpoint="http://$(OPEN_MATCH_HELM_NAME)-jaeger-collector:14268/api/traces" \
 		install/helm/open-match > install/yaml/01-open-match-core.yaml

 install/yaml/02-open-match-demo.yaml: build/toolchain/bin/helm$(EXE_EXTENSION)
@ -422,7 +403,6 @@ install/yaml/03-prometheus-chart.yaml: build/toolchain/bin/helm$(EXE_EXTENSION)
 		--set global.telemetry.prometheus.enabled=true \
 		install/helm/open-match > install/yaml/03-prometheus-chart.yaml

-# We have to hard-code the Prometheus Server URL as we are excluding Prometheus, so Helm cannot determine the URL from the Prometheus subchart
 install/yaml/04-grafana-chart.yaml: build/toolchain/bin/helm$(EXE_EXTENSION)
 	mkdir -p install/yaml/
 	$(HELM) template $(OPEN_MATCH_HELM_NAME) $(HELM_TEMPLATE_FLAGS) $(HELM_IMAGE_FLAGS) \
@ -430,7 +410,6 @@ install/yaml/04-grafana-chart.yaml: build/toolchain/bin/helm$(EXE_EXTENSION)
 		--set open-match-core.redis.enabled=false \
 		--set open-match-telemetry.enabled=true \
 		--set global.telemetry.grafana.enabled=true \
-		--set-string global.telemetry.grafana.prometheusServer="http://$(OPEN_MATCH_HELM_NAME)-prometheus-server.$(OPEN_MATCH_KUBERNETES_NAMESPACE).svc.cluster.local:80/" \
 		install/helm/open-match > install/yaml/04-grafana-chart.yaml

 install/yaml/05-jaeger-chart.yaml: build/toolchain/bin/helm$(EXE_EXTENSION)
@ -477,29 +456,11 @@ set-redis-password:
 		read REDIS_PASSWORD; \
 		stty echo; \
 		printf "\n"; \
-		$(KUBECTL) create secret generic open-match-redis -n $(OPEN_MATCH_KUBERNETES_NAMESPACE) --from-literal=redis-password=$$REDIS_PASSWORD --dry-run -o yaml | $(KUBECTL) replace -f - --force
-## ####################################
-## # Tool installation helpers
-##
+		$(KUBECTL) create secret generic om-redis -n $(OPEN_MATCH_KUBERNETES_NAMESPACE) --from-literal=redis-password=$$REDIS_PASSWORD --dry-run -o yaml | $(KUBECTL) replace -f - --force

-## # Install toolchain. Short for installing K8s, protoc and OpenMatch tools.
-## make install-toolchain
-##
 install-toolchain: install-kubernetes-tools install-protoc-tools install-openmatch-tools
-
-## # Install Kubernetes tools
-## make install-kubernetes-tools
-##
 install-kubernetes-tools: build/toolchain/bin/kubectl$(EXE_EXTENSION) build/toolchain/bin/helm$(EXE_EXTENSION) build/toolchain/bin/minikube$(EXE_EXTENSION) build/toolchain/bin/terraform$(EXE_EXTENSION)
-
-## # Install protoc tools
-## make install-protoc-tools
-##
-install-protoc-tools: build/toolchain/bin/protoc$(EXE_EXTENSION) build/toolchain/bin/protoc-gen-go$(EXE_EXTENSION) build/toolchain/bin/protoc-gen-grpc-gateway$(EXE_EXTENSION) build/toolchain/bin/protoc-gen-openapiv2$(EXE_EXTENSION)
-
-## # Install OpenMatch tools
-## make install-openmatch-tools
-##
+install-protoc-tools: build/toolchain/bin/protoc$(EXE_EXTENSION) build/toolchain/bin/protoc-gen-go$(EXE_EXTENSION) build/toolchain/bin/protoc-gen-grpc-gateway$(EXE_EXTENSION) build/toolchain/bin/protoc-gen-swagger$(EXE_EXTENSION)
 install-openmatch-tools: build/toolchain/bin/certgen$(EXE_EXTENSION) build/toolchain/bin/reaper$(EXE_EXTENSION)

 build/toolchain/bin/helm$(EXE_EXTENSION):
@ -571,19 +532,19 @@ build/toolchain/bin/protoc-gen-go$(EXE_EXTENSION):
 	cd $(TOOLCHAIN_BIN) && $(GO) build -i -pkgdir . github.com/golang/protobuf/protoc-gen-go

 build/toolchain/bin/protoc-gen-grpc-gateway$(EXE_EXTENSION):
-	cd $(TOOLCHAIN_BIN) && $(GO) build -i -pkgdir . github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway
+	cd $(TOOLCHAIN_BIN) && $(GO) build -i -pkgdir . github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway

-build/toolchain/bin/protoc-gen-openapiv2$(EXE_EXTENSION):
+build/toolchain/bin/protoc-gen-swagger$(EXE_EXTENSION):
 	mkdir -p $(TOOLCHAIN_BIN)
-	cd $(TOOLCHAIN_BIN) && $(GO) build -i -pkgdir . github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2
+	cd $(TOOLCHAIN_BIN) && $(GO) build -i -pkgdir . github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger

-build/toolchain/bin/certgen$(EXE_EXTENSION):
+build/toolchain/bin/certgen$(EXE_EXTENSION): tools/certgen/certgen$(EXE_EXTENSION)
 	mkdir -p $(TOOLCHAIN_BIN)
-	cd $(TOOLCHAIN_BIN) && $(GO) build $(REPOSITORY_ROOT)/tools/certgen/
+	cp -f $(REPOSITORY_ROOT)/tools/certgen/certgen$(EXE_EXTENSION) $(CERTGEN)

-build/toolchain/bin/reaper$(EXE_EXTENSION):
+build/toolchain/bin/reaper$(EXE_EXTENSION): tools/reaper/reaper$(EXE_EXTENSION)
 	mkdir -p $(TOOLCHAIN_BIN)
-	cd $(TOOLCHAIN_BIN) && $(GO) build $(REPOSITORY_ROOT)/tools/reaper/
+	cp -f $(REPOSITORY_ROOT)/tools/reaper/reaper$(EXE_EXTENSION) $(TOOLCHAIN_BIN)/reaper$(EXE_EXTENSION)

 # Fake target for docker
 docker: no-sudo
@ -633,21 +594,16 @@ get-kind-kubeconfig: build/toolchain/bin/kind$(EXE_EXTENSION)
 delete-kind-cluster: build/toolchain/bin/kind$(EXE_EXTENSION) build/toolchain/bin/kubectl$(EXE_EXTENSION)
 	-$(KIND) delete cluster

-create-cluster-role-binding:
-	$(KUBECTL) create clusterrolebinding myname-cluster-admin-binding --clusterrole=cluster-admin --user=$(GCLOUD_ACCOUNT_EMAIL)
-
-create-gke-cluster: GKE_VERSION = 1.20.8-gke.900 # gcloud beta container get-server-config --zone us-west1-a
-create-gke-cluster: GKE_CLUSTER_SHAPE_FLAGS = --machine-type n1-standard-8 --enable-autoscaling --min-nodes 1 --num-nodes 6 --max-nodes 10 --disk-size 50
+create-gke-cluster: GKE_VERSION = 1.14.8-gke.17 # gcloud beta container get-server-config --zone us-west1-a
+create-gke-cluster: GKE_CLUSTER_SHAPE_FLAGS = --machine-type n1-standard-4 --enable-autoscaling --min-nodes 1 --num-nodes 2 --max-nodes 10 --disk-size 50
 create-gke-cluster: GKE_FUTURE_COMPAT_FLAGS = --no-enable-basic-auth --no-issue-client-certificate --enable-ip-alias --metadata disable-legacy-endpoints=true --enable-autoupgrade
 create-gke-cluster: build/toolchain/bin/kubectl$(EXE_EXTENSION) gcloud
 	$(GCLOUD) beta $(GCP_PROJECT_FLAG) container clusters create $(GKE_CLUSTER_NAME) $(GCP_LOCATION_FLAG) $(GKE_CLUSTER_SHAPE_FLAGS) $(GKE_FUTURE_COMPAT_FLAGS) $(GKE_CLUSTER_FLAGS) \
 		--enable-pod-security-policy \
 		--cluster-version $(GKE_VERSION) \
 		--image-type cos_containerd \
-		--tags open-match \
-		--workload-pool $(PROJECT_ID).svc.id.goog
-	$(MAKE) create-cluster-role-binding
-	
+		--tags open-match
+	$(KUBECTL) create clusterrolebinding myname-cluster-admin-binding --clusterrole=cluster-admin --user=$(GCLOUD_ACCOUNT_EMAIL)

 delete-gke-cluster: gcloud
 	-$(GCLOUD) $(GCP_PROJECT_FLAG) container clusters delete $(GKE_CLUSTER_NAME) $(GCP_LOCATION_FLAG) $(GCLOUD_EXTRA_FLAGS)
@ -661,19 +617,12 @@ delete-mini-cluster: build/toolchain/bin/minikube$(EXE_EXTENSION)
 gcp-apply-binauthz-policy: build/policies/binauthz.yaml
 	$(GCLOUD) beta $(GCP_PROJECT_FLAG) container binauthz policy import build/policies/binauthz.yaml

-## ####################################
-## # Protobuf
-##
-
-## # Build all protobuf definitions.
-## make all-protos
-##
 all-protos: $(ALL_PROTOS)

 # The proto generator really wants to be run from the $GOPATH root, and doesn't
 # support methods for directing it to the correct location that's not the proto
-# file's location. 
-# So, instead, put it in a tempororary directory, then move it out.
+# file's location.  So instead put it in a tempororary directory, then move it
+# out.
 pkg/pb/%.pb.go: api/%.proto third_party/ build/toolchain/bin/protoc$(EXE_EXTENSION) build/toolchain/bin/protoc-gen-go$(EXE_EXTENSION) build/toolchain/bin/protoc-gen-grpc-gateway$(EXE_EXTENSION)
 	mkdir -p $(REPOSITORY_ROOT)/build/prototmp $(REPOSITORY_ROOT)/pkg/pb
 	$(PROTOC) $< \
@ -695,24 +644,25 @@ pkg/pb/%.pb.gw.go: api/%.proto third_party/ build/toolchain/bin/protoc$(EXE_EXTE
   		--grpc-gateway_out=logtostderr=true,allow_delete_body=true:$(REPOSITORY_ROOT)/build/prototmp
 	mv $(REPOSITORY_ROOT)/build/prototmp/open-match.dev/open-match/$@ $@

-api/%.swagger.json: api/%.proto third_party/ build/toolchain/bin/protoc$(EXE_EXTENSION) build/toolchain/bin/protoc-gen-openapiv2$(EXE_EXTENSION)
+api/%.swagger.json: api/%.proto third_party/ build/toolchain/bin/protoc$(EXE_EXTENSION) build/toolchain/bin/protoc-gen-swagger$(EXE_EXTENSION)
 	$(PROTOC) $< \
 		-I $(REPOSITORY_ROOT) -I $(PROTOC_INCLUDES) \
-		--openapiv2_out=json_names_for_fields=false,logtostderr=true,allow_delete_body=true:$(REPOSITORY_ROOT)
+		--swagger_out=logtostderr=true,allow_delete_body=true:$(REPOSITORY_ROOT)

-
-## # Build API reference in markdown. Needs open-match-docs repo at the same level as this one.
-## make api/api.md
-##
 api/api.md: third_party/ build/toolchain/bin/protoc-gen-doc$(EXE_EXTENSION)
 	$(PROTOC) api/*.proto \
 		-I $(REPOSITORY_ROOT) -I $(PROTOC_INCLUDES) \
  		--doc_out=. \
-  		--doc_opt=markdown,api_temp.md
+  		--doc_opt=markdown,api.md
 # Crazy hack that insert hugo link reference to this API doc -)
-	cat ./docs/hugo_apiheader.txt ./api_temp.md >> api.md
-	mv ./api.md $(REPOSITORY_ROOT)/../open-match-docs/site/content/en/docs/Reference/
-	rm ./api_temp.md
+	$(SED_REPLACE) '1 i\---\
+title: "Open Match API References" \
+linkTitle: "Open Match API References" \
+weight: 2 \
+description: \
+  This document provides API references for Open Match services. \
+--- \
+' ./api.md && mv ./api.md $(REPOSITORY_ROOT)/../open-match-docs/site/content/en/docs/Reference/

 # Include structure of the protos needs to be called out do the dependency chain is run through properly.
 pkg/pb/backend.pb.go: pkg/pb/messages.pb.go
@ -721,47 +671,14 @@ pkg/pb/matchfunction.pb.go: pkg/pb/messages.pb.go
 pkg/pb/query.pb.go: pkg/pb/messages.pb.go
 pkg/pb/evaluator.pb.go: pkg/pb/messages.pb.go
 internal/ipb/synchronizer.pb.go: pkg/pb/messages.pb.go
-internal/ipb/messages.pb.go: pkg/pb/messages.pb.go

-## ####################################
-## # Go tasks
-##
-
-## # Build assets and binaries
-## make build
-##
 build: assets
 	$(GO) build ./...
 	$(GO) build -tags e2ecluster ./...

-define test_folder
-	$(if $(wildcard $(1)/go.mod), \
-		cd $(1) && \
-		$(GO) test -cover -test.count $(GOLANG_TEST_COUNT) -race ./... && \
-		$(GO) test -cover -test.count $(GOLANG_TEST_COUNT) -run IgnoreRace$$ ./... \
-    )
-	$(foreach dir, $(wildcard $(1)/*/.), $(call test_folder, $(dir)))
-endef
-
-define fast_test_folder
-	$(if $(wildcard $(1)/go.mod), \
-		cd $(1) && \
-		$(GO) test ./... \
-    )
-	$(foreach dir, $(wildcard $(1)/*/.), $(call fast_test_folder, $(dir)))
-endef
-
-## # Run go tests
-## make test
-##
 test: $(ALL_PROTOS) tls-certs third_party/
-	$(call test_folder,.)
-
-## # Run go tests more quickly, but with worse flake and race detection
-## make fasttest
-##
-fasttest: $(ALL_PROTOS) tls-certs third_party/
-	$(call fast_test_folder,.)
+	$(GO) test -cover -test.count $(GOLANG_TEST_COUNT) -race ./...
+	$(GO) test -cover -test.count $(GOLANG_TEST_COUNT) -run IgnoreRace$$ ./...

 test-e2e-cluster: all-protos tls-certs third_party/
 	$(HELM) test --timeout 7m30s -v 0 --logs -n $(OPEN_MATCH_KUBERNETES_NAMESPACE) $(OPEN_MATCH_HELM_NAME)
@ -776,9 +693,6 @@ vet:
 golangci: build/toolchain/bin/golangci-lint$(EXE_EXTENSION)
 	GO111MODULE=on $(GOLANGCI) run --config=$(REPOSITORY_ROOT)/.golangci.yaml

-## # Run linter on Go code, charts and terraform
-## make lint
-##
 lint: fmt vet golangci lint-chart terraform-lint

 assets: $(ALL_PROTOS) tls-certs third_party/ build/chart/
@ -809,6 +723,58 @@ build/cmd/demo-%/COPY_PHONY:
 	mkdir -p $(BUILD_DIR)/cmd/demo-$*/
 	cp -r examples/demo/static $(BUILD_DIR)/cmd/demo-$*/static

+all: service-binaries example-binaries tools-binaries
+
+service-binaries: cmd/minimatch/minimatch$(EXE_EXTENSION) cmd/swaggerui/swaggerui$(EXE_EXTENSION)
+service-binaries: cmd/backend/backend$(EXE_EXTENSION) cmd/frontend/frontend$(EXE_EXTENSION)
+service-binaries: cmd/query/query$(EXE_EXTENSION) cmd/synchronizer/synchronizer$(EXE_EXTENSION)
+
+example-binaries: example-mmf-binaries example-evaluator-binaries
+example-mmf-binaries: examples/functions/golang/soloduel/soloduel$(EXE_EXTENSION)
+example-evaluator-binaries: test/evaluator/evaluator$(EXE_EXTENSION)
+
+examples/functions/golang/soloduel/soloduel$(EXE_EXTENSION): pkg/pb/query.pb.go pkg/pb/query.pb.gw.go api/query.swagger.json pkg/pb/matchfunction.pb.go pkg/pb/matchfunction.pb.gw.go api/matchfunction.swagger.json
+	cd $(REPOSITORY_ROOT)/examples/functions/golang/soloduel; $(GO_BUILD_COMMAND)
+
+test/matchfunction/matchfunction$(EXE_EXTENSION): pkg/pb/query.pb.go pkg/pb/query.pb.gw.go api/query.swagger.json pkg/pb/matchfunction.pb.go pkg/pb/matchfunction.pb.gw.go api/matchfunction.swagger.json
+	cd $(REPOSITORY_ROOT)/test/matchfunction; $(GO_BUILD_COMMAND)
+
+test/evaluator/evaluator$(EXE_EXTENSION): pkg/pb/evaluator.pb.go pkg/pb/evaluator.pb.gw.go api/evaluator.swagger.json
+	cd $(REPOSITORY_ROOT)/test/evaluator; $(GO_BUILD_COMMAND)
+
+tools-binaries: tools/certgen/certgen$(EXE_EXTENSION) tools/reaper/reaper$(EXE_EXTENSION)
+
+cmd/backend/backend$(EXE_EXTENSION): pkg/pb/backend.pb.go pkg/pb/backend.pb.gw.go api/backend.swagger.json
+	cd $(REPOSITORY_ROOT)/cmd/backend; $(GO_BUILD_COMMAND)
+
+cmd/frontend/frontend$(EXE_EXTENSION): pkg/pb/frontend.pb.go pkg/pb/frontend.pb.gw.go api/frontend.swagger.json
+	cd $(REPOSITORY_ROOT)/cmd/frontend; $(GO_BUILD_COMMAND)
+
+cmd/query/query$(EXE_EXTENSION): pkg/pb/query.pb.go pkg/pb/query.pb.gw.go api/query.swagger.json
+	cd $(REPOSITORY_ROOT)/cmd/query; $(GO_BUILD_COMMAND)
+
+cmd/synchronizer/synchronizer$(EXE_EXTENSION): internal/ipb/synchronizer.pb.go
+	cd $(REPOSITORY_ROOT)/cmd/synchronizer; $(GO_BUILD_COMMAND)
+
+# Note: This list of dependencies is long but only add file references here. If you add a .PHONY dependency make will always rebuild it.
+cmd/minimatch/minimatch$(EXE_EXTENSION): pkg/pb/backend.pb.go pkg/pb/backend.pb.gw.go api/backend.swagger.json
+cmd/minimatch/minimatch$(EXE_EXTENSION): pkg/pb/frontend.pb.go pkg/pb/frontend.pb.gw.go api/frontend.swagger.json
+cmd/minimatch/minimatch$(EXE_EXTENSION): pkg/pb/query.pb.go pkg/pb/query.pb.gw.go api/query.swagger.json
+cmd/minimatch/minimatch$(EXE_EXTENSION): pkg/pb/evaluator.pb.go pkg/pb/evaluator.pb.gw.go api/evaluator.swagger.json
+cmd/minimatch/minimatch$(EXE_EXTENSION): pkg/pb/matchfunction.pb.go pkg/pb/matchfunction.pb.gw.go api/matchfunction.swagger.json
+cmd/minimatch/minimatch$(EXE_EXTENSION): pkg/pb/messages.pb.go
+cmd/minimatch/minimatch$(EXE_EXTENSION): internal/ipb/synchronizer.pb.go
+	cd $(REPOSITORY_ROOT)/cmd/minimatch; $(GO_BUILD_COMMAND)
+
+cmd/swaggerui/swaggerui$(EXE_EXTENSION): third_party/swaggerui/
+	cd $(REPOSITORY_ROOT)/cmd/swaggerui; $(GO_BUILD_COMMAND)
+
+tools/certgen/certgen$(EXE_EXTENSION):
+	cd $(REPOSITORY_ROOT)/tools/certgen/ && $(GO_BUILD_COMMAND)
+
+tools/reaper/reaper$(EXE_EXTENSION):
+	cd $(REPOSITORY_ROOT)/tools/reaper/ && $(GO_BUILD_COMMAND)
+
 build/policies/binauthz.yaml: install/policies/binauthz.yaml
 	mkdir -p $(BUILD_DIR)/policies
 	cp -f $(REPOSITORY_ROOT)/install/policies/binauthz.yaml $(BUILD_DIR)/policies/binauthz.yaml
@ -849,13 +815,13 @@ md-test: docker

 ci-deploy-artifacts: install/yaml/ $(SWAGGER_JSON_DOCS) build/chart/ gcloud
 ifeq ($(_GCB_POST_SUBMIT),1)
-	gsutil cp -a public-read $(REPOSITORY_ROOT)/install/yaml/* $(_CHARTS_BUCKET)/install/v$(BASE_VERSION)/yaml/
-	gsutil cp -a public-read $(REPOSITORY_ROOT)/api/*.json $(_CHARTS_BUCKET)/api/v$(BASE_VERSION)/
+	gsutil cp -a public-read $(REPOSITORY_ROOT)/install/yaml/* gs://open-match-chart/install/v$(BASE_VERSION)/yaml/
+	gsutil cp -a public-read $(REPOSITORY_ROOT)/api/*.json gs://open-match-chart/api/v$(BASE_VERSION)/
 	# Deploy Helm Chart
 	# Since each build will refresh just it's version we can allow this for every post submit.
 	# Copy the files into multiple locations to keep a backup.
-	gsutil cp -a public-read $(BUILD_DIR)/chart/*.* $(_CHARTS_BUCKET)/chart/by-hash/$(VERSION)/
-	gsutil cp -a public-read $(BUILD_DIR)/chart/*.* $(_CHARTS_BUCKET)/chart/
+	gsutil cp -a public-read $(BUILD_DIR)/chart/*.* gs://open-match-chart/chart/by-hash/$(VERSION)/
+	gsutil cp -a public-read $(BUILD_DIR)/chart/*.* gs://open-match-chart/chart/
 else
 	@echo "Not deploying build artifacts to open-match.dev because this is not a post commit change."
 endif
@ -865,7 +831,7 @@ ci-reap-namespaces: build/toolchain/bin/reaper$(EXE_EXTENSION)

 # For presubmit we want to update the protobuf generated files and verify that tests are good.
 presubmit: GOLANG_TEST_COUNT = 5
-presubmit: clean third_party/ update-chart-deps assets update-deps lint build test md-test terraform-test
+presubmit: clean third_party/ update-chart-deps assets update-deps lint build install-toolchain test md-test terraform-test

 build/release/: presubmit clean-install-yaml install/yaml/
 	mkdir -p $(BUILD_DIR)/release/
@ -899,6 +865,19 @@ clean-protos:
 	rm -rf $(REPOSITORY_ROOT)/pkg/pb/
 	rm -rf $(REPOSITORY_ROOT)/internal/ipb/

+clean-binaries:
+	rm -rf $(REPOSITORY_ROOT)/cmd/backend/backend$(EXE_EXTENSION)
+	rm -rf $(REPOSITORY_ROOT)/cmd/synchronizer/synchronizer$(EXE_EXTENSION)
+	rm -rf $(REPOSITORY_ROOT)/cmd/frontend/frontend$(EXE_EXTENSION)
+	rm -rf $(REPOSITORY_ROOT)/cmd/query/query$(EXE_EXTENSION)
+	rm -rf $(REPOSITORY_ROOT)/cmd/minimatch/minimatch$(EXE_EXTENSION)
+	rm -rf $(REPOSITORY_ROOT)/examples/functions/golang/soloduel/soloduel$(EXE_EXTENSION)
+	rm -rf $(REPOSITORY_ROOT)/test/matchfunction/matchfunction$(EXE_EXTENSION)
+	rm -rf $(REPOSITORY_ROOT)/test/evaluator/evaluator$(EXE_EXTENSION)
+	rm -rf $(REPOSITORY_ROOT)/cmd/swaggerui/swaggerui$(EXE_EXTENSION)
+	rm -rf $(REPOSITORY_ROOT)/tools/certgen/certgen$(EXE_EXTENSION)
+	rm -rf $(REPOSITORY_ROOT)/tools/reaper/reaper$(EXE_EXTENSION)
+
 clean-terraform:
 	rm -rf $(REPOSITORY_ROOT)/install/terraform/.terraform/

@ -923,7 +902,7 @@ clean-swagger-docs:
 clean-third-party:
 	rm -rf $(REPOSITORY_ROOT)/third_party/

-clean: clean-images clean-build clean-install-yaml clean-secrets clean-terraform clean-third-party clean-protos clean-swagger-docs
+clean: clean-images clean-binaries clean-build clean-install-yaml clean-secrets clean-terraform clean-third-party clean-protos clean-swagger-docs

 proxy-frontend: build/toolchain/bin/kubectl$(EXE_EXTENSION)
 	@echo "Frontend Health: http://localhost:$(FRONTEND_PORT)/healthz"
@ -984,24 +963,24 @@ proxy:
 update-deps:
 	$(GO) mod tidy

-third_party/: third_party/google/api third_party/protoc-gen-openapiv2/options third_party/swaggerui/
+third_party/: third_party/google/api third_party/protoc-gen-swagger/options third_party/swaggerui/

 third_party/google/api:
 	mkdir -p $(TOOLCHAIN_DIR)/googleapis-temp/
 	mkdir -p $(REPOSITORY_ROOT)/third_party/google/api
 	mkdir -p $(REPOSITORY_ROOT)/third_party/google/rpc
-	curl -o $(TOOLCHAIN_DIR)/googleapis-temp/googleapis.zip -L https://github.com/googleapis/googleapis/archive/$(GOOGLE_APIS_VERSION).zip
+	curl -o $(TOOLCHAIN_DIR)/googleapis-temp/googleapis.zip -L https://github.com/googleapis/googleapis/archive/master.zip
 	(cd $(TOOLCHAIN_DIR)/googleapis-temp/; unzip -q -o googleapis.zip)
-	cp -f $(TOOLCHAIN_DIR)/googleapis-temp/googleapis-$(GOOGLE_APIS_VERSION)/google/api/*.proto $(REPOSITORY_ROOT)/third_party/google/api/
-	cp -f $(TOOLCHAIN_DIR)/googleapis-temp/googleapis-$(GOOGLE_APIS_VERSION)/google/rpc/*.proto $(REPOSITORY_ROOT)/third_party/google/rpc/
+	cp -f $(TOOLCHAIN_DIR)/googleapis-temp/googleapis-master/google/api/*.proto $(REPOSITORY_ROOT)/third_party/google/api/
+	cp -f $(TOOLCHAIN_DIR)/googleapis-temp/googleapis-master/google/rpc/*.proto $(REPOSITORY_ROOT)/third_party/google/rpc/
 	rm -rf $(TOOLCHAIN_DIR)/googleapis-temp

-third_party/protoc-gen-openapiv2/options:
+third_party/protoc-gen-swagger/options:
 	mkdir -p $(TOOLCHAIN_DIR)/grpc-gateway-temp/
-	mkdir -p $(REPOSITORY_ROOT)/third_party/protoc-gen-openapiv2/options
-	curl -o $(TOOLCHAIN_DIR)/grpc-gateway-temp/grpc-gateway.zip -L https://github.com/grpc-ecosystem/grpc-gateway/archive/v$(GRPC_GATEWAY_VERSION).zip
+	mkdir -p $(REPOSITORY_ROOT)/third_party/protoc-gen-swagger/options
+	curl -o $(TOOLCHAIN_DIR)/grpc-gateway-temp/grpc-gateway.zip -L https://github.com/grpc-ecosystem/grpc-gateway/archive/master.zip
 	(cd $(TOOLCHAIN_DIR)/grpc-gateway-temp/; unzip -q -o grpc-gateway.zip)
-	cp -f $(TOOLCHAIN_DIR)/grpc-gateway-temp/grpc-gateway-$(GRPC_GATEWAY_VERSION)/protoc-gen-openapiv2/options/*.proto $(REPOSITORY_ROOT)/third_party/protoc-gen-openapiv2/options/
+	cp -f $(TOOLCHAIN_DIR)/grpc-gateway-temp/grpc-gateway-master/protoc-gen-swagger/options/*.proto $(REPOSITORY_ROOT)/third_party/protoc-gen-swagger/options/
 	rm -rf $(TOOLCHAIN_DIR)/grpc-gateway-temp

 third_party/swaggerui/:
--- a/README.md
+++ b/README.md
@ -24,6 +24,10 @@ The [Open Match Development guide](docs/development.md) has detailed instruction
 on getting the source code, making changes, testing and submitting a pull request
 to Open Match.

+## Disclaimer
+
+This software is currently alpha, and subject to change.
+
 ## Support

 * [Slack Channel](https://open-match.slack.com/) ([Signup](https://join.slack.com/t/open-match/shared_invite/enQtNDM1NjcxNTY4MTgzLTM5ZWQxNjc1YWI3MzJmN2RiMWJmYWI0ZjFiNzNkZmNkMWQ3YWU5OGVkNzA5Yzc4OGVkOGU5MTc0OTA5ZTA5NDU))
--- a/api/backend.proto
+++ b/api/backend.proto
@ -19,9 +19,9 @@ option csharp_namespace = "OpenMatch";

 import "api/messages.proto";
 import "google/api/annotations.proto";
-import "protoc-gen-openapiv2/options/annotations.proto";
+import "protoc-gen-swagger/options/annotations.proto";

-option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
+option (grpc.gateway.protoc_gen_swagger.options.openapiv2_swagger) = {
  info: {
    title: "Backend"
    version: "1.0"
@ -88,12 +88,7 @@ message ReleaseTicketsRequest{

 message ReleaseTicketsResponse {}

-message ReleaseAllTicketsRequest{}
-
-message ReleaseAllTicketsResponse {}
-
-// AssignmentGroup contains an Assignment and the Tickets to which it should be applied. 
-message AssignmentGroup {
+message AssignTicketsRequest {
  // TicketIds is a list of strings representing Open Match generated Ids which apply to an Assignment.
  repeated string ticket_ids = 1;

@ -101,34 +96,13 @@ message AssignmentGroup {
  Assignment assignment = 2;
 }

-// AssignmentFailure contains the id of the Ticket that failed the Assignment and the failure status.
-message AssignmentFailure {
-  enum Cause {
-    UNKNOWN = 0;
-    TICKET_NOT_FOUND = 1;
-  }
-
-  string ticket_id = 1;
-  Cause cause = 2;
-}
-
-message AssignTicketsRequest {
-  // Assignments is a list of assignment groups that contain assignment and the Tickets to which they should be applied.
-  repeated AssignmentGroup assignments = 1;
-}
-
-message AssignTicketsResponse {
-  // Failures is a list of all the Tickets that failed assignment along with the cause of failure. 
-  repeated AssignmentFailure failures = 1;
-}
+message AssignTicketsResponse {}

 // The BackendService implements APIs to generate matches and handle ticket assignments.
 service BackendService {
-  // FetchMatches triggers a MatchFunction with the specified MatchProfile and
-  // returns a set of matches generated by the Match Making Function, and
-  // accepted by the evaluator.
-  // Tickets in matches returned by FetchMatches are moved from active to
-  // pending, and will not be returned by query.
+  // FetchMatches triggers a MatchFunction with the specified MatchProfile and returns a set of match proposals that 
+  // match the description of that MatchProfile.
+  // FetchMatches immediately returns an error if it encounters any execution failures.
  rpc FetchMatches(FetchMatchesRequest) returns (stream FetchMatchesResponse) {
    option (google.api.http) = {
      post: "/v1/backendservice/matches:fetch"
@ -144,8 +118,10 @@ service BackendService {
    };
  }

-  // ReleaseTickets moves tickets from the pending state, to the active state.
-  // This enables them to be returned by query, and find different matches.
+  // ReleaseTickets removes the submitted tickets from the list that prevents tickets 
+  // that are awaiting assignment from appearing in MMF queries, effectively putting them back into
+  // the matchmaking pool
+  // 
  // BETA FEATURE WARNING:  This call and the associated Request and Response
  // messages are not finalized and still subject to possible change or removal.
  rpc ReleaseTickets(ReleaseTicketsRequest) returns (ReleaseTicketsResponse) {
@ -154,16 +130,4 @@ service BackendService {
      body: "*"
    };
  }
-
-  // ReleaseAllTickets moves all tickets from the pending state, to the active
-  // state. This enables them to be returned by query, and find different
-  // matches.
-  // BETA FEATURE WARNING:  This call and the associated Request and Response
-  // messages are not finalized and still subject to possible change or removal.
-  rpc ReleaseAllTickets(ReleaseAllTicketsRequest) returns (ReleaseAllTicketsResponse) {
-    option (google.api.http) = {
-      post: "/v1/backendservice/tickets:releaseall"
-      body: "*"
-    };
-  }
 }
--- a/api/backend.swagger.json
+++ b/api/backend.swagger.json
@ -13,11 +13,6 @@
      "url": "https://github.com/googleforgames/open-match/blob/master/LICENSE"
    }
  },
-  "tags": [
-    {
-      "name": "BackendService"
-    }
-  ],
  "schemes": [
    "http",
    "https"
@ -31,22 +26,13 @@
  "paths": {
    "/v1/backendservice/matches:fetch": {
      "post": {
-        "summary": "FetchMatches triggers a MatchFunction with the specified MatchProfile and\nreturns a set of matches generated by the Match Making Function, and\naccepted by the evaluator.\nTickets in matches returned by FetchMatches are moved from active to\npending, and will not be returned by query.",
-        "operationId": "BackendService_FetchMatches",
+        "summary": "FetchMatches triggers a MatchFunction with the specified MatchProfile and returns a set of match proposals that \nmatch the description of that MatchProfile.\nFetchMatches immediately returns an error if it encounters any execution failures.",
+        "operationId": "FetchMatches",
        "responses": {
          "200": {
            "description": "A successful response.(streaming responses)",
            "schema": {
-              "type": "object",
-              "properties": {
-                "result": {
-                  "$ref": "#/definitions/openmatchFetchMatchesResponse"
-                },
-                "error": {
-                  "$ref": "#/definitions/rpcStatus"
-                }
-              },
-              "title": "Stream result of openmatchFetchMatchesResponse"
+              "$ref": "#/x-stream-definitions/openmatchFetchMatchesResponse"
            }
          },
          "404": {
@ -55,12 +41,6 @@
              "type": "string",
              "format": "string"
            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
-            }
          }
        },
        "parameters": [
@ -81,7 +61,7 @@
    "/v1/backendservice/tickets:assign": {
      "post": {
        "summary": "AssignTickets overwrites the Assignment field of the input TicketIds.",
-        "operationId": "BackendService_AssignTickets",
+        "operationId": "AssignTickets",
        "responses": {
          "200": {
            "description": "A successful response.",
@ -95,12 +75,6 @@
              "type": "string",
              "format": "string"
            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
-            }
          }
        },
        "parameters": [
@ -120,8 +94,9 @@
    },
    "/v1/backendservice/tickets:release": {
      "post": {
-        "summary": "ReleaseTickets moves tickets from the pending state, to the active state.\nThis enables them to be returned by query, and find different matches.\nBETA FEATURE WARNING:  This call and the associated Request and Response\nmessages are not finalized and still subject to possible change or removal.",
-        "operationId": "BackendService_ReleaseTickets",
+        "summary": "ReleaseTickets removes the submitted tickets from the list that prevents tickets \nthat are awaiting assignment from appearing in MMF queries, effectively putting them back into\nthe matchmaking pool",
+        "description": "BETA FEATURE WARNING:  This call and the associated Request and Response\nmessages are not finalized and still subject to possible change or removal.",
+        "operationId": "ReleaseTickets",
        "responses": {
          "200": {
            "description": "A successful response.",
@ -135,12 +110,6 @@
              "type": "string",
              "format": "string"
            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
-            }
          }
        },
        "parameters": [
@ -157,91 +126,27 @@
          "BackendService"
        ]
      }
-    },
-    "/v1/backendservice/tickets:releaseall": {
-      "post": {
-        "summary": "ReleaseAllTickets moves all tickets from the pending state, to the active\nstate. This enables them to be returned by query, and find different\nmatches.\nBETA FEATURE WARNING:  This call and the associated Request and Response\nmessages are not finalized and still subject to possible change or removal.",
-        "operationId": "BackendService_ReleaseAllTickets",
-        "responses": {
-          "200": {
-            "description": "A successful response.",
-            "schema": {
-              "$ref": "#/definitions/openmatchReleaseAllTicketsResponse"
-            }
-          },
-          "404": {
-            "description": "Returned when the resource does not exist.",
-            "schema": {
-              "type": "string",
-              "format": "string"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
-            }
-          }
-        },
-        "parameters": [
-          {
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/openmatchReleaseAllTicketsRequest"
-            }
-          }
-        ],
-        "tags": [
-          "BackendService"
-        ]
-      }
    }
  },
  "definitions": {
-    "AssignmentFailureCause": {
-      "type": "string",
-      "enum": [
-        "UNKNOWN",
-        "TICKET_NOT_FOUND"
-      ],
-      "default": "UNKNOWN"
-    },
-    "DoubleRangeFilterExclude": {
-      "type": "string",
-      "enum": [
-        "NONE",
-        "MIN",
-        "MAX",
-        "BOTH"
-      ],
-      "default": "NONE",
-      "title": "- NONE: No bounds should be excluded when evaluating the filter, i.e.: MIN \u003c= x \u003c= MAX\n - MIN: Only the minimum bound should be excluded when evaluating the filter, i.e.: MIN \u003c x \u003c= MAX\n - MAX: Only the maximum bound should be excluded when evaluating the filter, i.e.: MIN \u003c= x \u003c MAX\n - BOTH: Both bounds should be excluded when evaluating the filter, i.e.: MIN \u003c x \u003c MAX"
-    },
    "openmatchAssignTicketsRequest": {
      "type": "object",
      "properties": {
-        "assignments": {
+        "ticket_ids": {
          "type": "array",
          "items": {
-            "$ref": "#/definitions/openmatchAssignmentGroup"
+            "type": "string"
          },
-          "description": "Assignments is a list of assignment groups that contain assignment and the Tickets to which they should be applied."
+          "description": "TicketIds is a list of strings representing Open Match generated Ids which apply to an Assignment."
+        },
+        "assignment": {
+          "$ref": "#/definitions/openmatchAssignment",
+          "description": "An Assignment specifies game connection related information to be associated with the TicketIds."
        }
      }
    },
    "openmatchAssignTicketsResponse": {
-      "type": "object",
-      "properties": {
-        "failures": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/openmatchAssignmentFailure"
-          },
-          "description": "Failures is a list of all the Tickets that failed assignment along with the cause of failure."
-        }
-      }
+      "type": "object"
    },
    "openmatchAssignment": {
      "type": "object",
@ -258,67 +163,7 @@
          "description": "Customized information not inspected by Open Match, to be used by the match\nmaking function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
        }
      },
-      "description": "An Assignment represents a game server assignment associated with a Ticket.\nOpen Match does not require or inspect any fields on assignment."
-    },
-    "openmatchAssignmentFailure": {
-      "type": "object",
-      "properties": {
-        "ticket_id": {
-          "type": "string"
-        },
-        "cause": {
-          "$ref": "#/definitions/AssignmentFailureCause"
-        }
-      },
-      "description": "AssignmentFailure contains the id of the Ticket that failed the Assignment and the failure status."
-    },
-    "openmatchAssignmentGroup": {
-      "type": "object",
-      "properties": {
-        "ticket_ids": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          },
-          "description": "TicketIds is a list of strings representing Open Match generated Ids which apply to an Assignment."
-        },
-        "assignment": {
-          "$ref": "#/definitions/openmatchAssignment",
-          "description": "An Assignment specifies game connection related information to be associated with the TicketIds."
-        }
-      },
-      "description": "AssignmentGroup contains an Assignment and the Tickets to which it should be applied."
-    },
-    "openmatchBackfill": {
-      "type": "object",
-      "properties": {
-        "id": {
-          "type": "string",
-          "description": "Id represents an auto-generated Id issued by Open Match."
-        },
-        "search_fields": {
-          "$ref": "#/definitions/openmatchSearchFields",
-          "description": "Search fields are the fields which Open Match is aware of, and can be used\nwhen specifying filters."
-        },
-        "extensions": {
-          "type": "object",
-          "additionalProperties": {
-            "$ref": "#/definitions/protobufAny"
-          },
-          "description": "Customized information not inspected by Open Match, to be used by\nthe Match Function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
-        },
-        "create_time": {
-          "type": "string",
-          "format": "date-time",
-          "description": "Create time is the time the Ticket was created. It is populated by Open\nMatch at the time of Ticket creation."
-        },
-        "generation": {
-          "type": "string",
-          "format": "int64",
-          "description": "Generation gets incremented on GameServers update operations.\nPrevents the MMF from overriding a newer version from the game server.\nDo NOT read or write to this field, it is for internal tracking, and changing the value will cause bugs."
-        }
-      },
-      "description": "Represents a backfill entity which is used to fill partially full matches.\n\nBETA FEATURE WARNING:  This call and the associated Request and Response\nmessages are not finalized and still subject to possible change or removal."
+      "description": "An Assignment represents a game server assignment associated with a Ticket. Open\nmatch does not require or inspect any fields on assignment."
    },
    "openmatchDoubleRangeFilter": {
      "type": "object",
@ -336,10 +181,6 @@
          "type": "number",
          "format": "double",
          "description": "Minimum value."
-        },
-        "exclude": {
-          "$ref": "#/definitions/DoubleRangeFilterExclude",
-          "description": "Defines the bounds to apply when filtering tickets by their search_fields.double_args value.\nBETA FEATURE WARNING: This field and the associated values are\nnot finalized and still subject to possible change or removal."
        }
      },
      "title": "Filters numerical values to only those within a range.\n  double_arg: \"foo\"\n  max: 10\n  min: 5\nmatches:\n  {\"foo\": 5}\n  {\"foo\": 7.5}\n  {\"foo\": 10}\ndoes not match:\n  {\"foo\": 4}\n  {\"foo\": 10.01}\n  {\"foo\": \"7.5\"}\n  {}"
@ -418,14 +259,6 @@
            "$ref": "#/definitions/protobufAny"
          },
          "description": "Customized information not inspected by Open Match, to be used by the match\nmaking function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
-        },
-        "backfill": {
-          "$ref": "#/definitions/openmatchBackfill",
-          "description": "Backfill request which contains additional information to the match\nand contains an association to a GameServer.\nBETA FEATURE WARNING: This field is not finalized and still subject\nto possible change or removal."
-        },
-        "allocate_gameserver": {
-          "type": "boolean",
-          "description": "AllocateGameServer signalise Director that Backfill is new and it should \nallocate a GameServer, this Backfill would be assigned.\nBETA FEATURE WARNING: This field is not finalized and still subject\nto possible change or removal."
        }
      },
      "description": "A Match is used to represent a completed match object. It can be generated by\na MatchFunction as a proposal or can be returned by OpenMatch as a result in\nresponse to the FetchMatches call.\nWhen a match is returned by the FetchMatches call, it should contain at least\none ticket to be considered as valid."
@ -466,7 +299,7 @@
          "items": {
            "$ref": "#/definitions/openmatchDoubleRangeFilter"
          },
-          "description": "Set of Filters indicating the filtering criteria. Selected tickets must\nmatch every Filter."
+          "description": "Set of Filters indicating the filtering criteria. Selected players must\nmatch every Filter."
        },
        "string_equals_filters": {
          "type": "array",
@ -479,25 +312,8 @@
          "items": {
            "$ref": "#/definitions/openmatchTagPresentFilter"
          }
-        },
-        "created_before": {
-          "type": "string",
-          "format": "date-time",
-          "description": "If specified, only Tickets created before the specified time are selected."
-        },
-        "created_after": {
-          "type": "string",
-          "format": "date-time",
-          "description": "If specified, only Tickets created after the specified time are selected."
        }
-      },
-      "description": "Pool specfies a set of criteria that are used to select a subset of Tickets\nthat meet all the criteria."
-    },
-    "openmatchReleaseAllTicketsRequest": {
-      "type": "object"
-    },
-    "openmatchReleaseAllTicketsResponse": {
-      "type": "object"
+      }
    },
    "openmatchReleaseTicketsRequest": {
      "type": "object",
@ -573,7 +389,7 @@
        },
        "assignment": {
          "$ref": "#/definitions/openmatchAssignment",
-          "description": "An Assignment represents a game server assignment associated with a Ticket,\nor whatever finalized matched state means for your use case.\nOpen Match does not require or inspect any fields on Assignment."
+          "description": "An Assignment represents a game server assignment associated with a Ticket.\nOpen Match does not require or inspect any fields on Assignment."
        },
        "search_fields": {
          "$ref": "#/definitions/openmatchSearchFields",
@ -585,14 +401,9 @@
            "$ref": "#/definitions/protobufAny"
          },
          "description": "Customized information not inspected by Open Match, to be used by the match\nmaking function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
-        },
-        "create_time": {
-          "type": "string",
-          "format": "date-time",
-          "description": "Create time is the time the Ticket was created. It is populated by Open\nMatch at the time of Ticket creation."
        }
      },
-      "description": "A Ticket is a basic matchmaking entity in Open Match. A Ticket may represent\nan individual 'Player', a 'Group' of players, or any other concepts unique to\nyour use case. Open Match will not interpret what the Ticket represents but\njust treat it as a matchmaking unit with a set of SearchFields. Open Match\nstores the Ticket in state storage and enables an Assignment to be set on the\nTicket."
+      "description": "A Ticket is a basic matchmaking entity in Open Match. A Ticket represents either an\nindividual 'Player' or a 'Group' of players. Open Match will not interpret\nwhat the Ticket represents but just treat it as a matchmaking unit with a set\nof SearchFields. Open Match stores the Ticket in state storage and enables an\nAssignment to be associated with this Ticket."
    },
    "protobufAny": {
      "type": "object",
@ -609,27 +420,44 @@
      },
      "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n    Foo foo = ...;\n    Any any;\n    any.PackFrom(foo);\n    ...\n    if (any.UnpackTo(\u0026foo)) {\n      ...\n    }\n\nExample 2: Pack and unpack a message in Java.\n\n    Foo foo = ...;\n    Any any = Any.pack(foo);\n    ...\n    if (any.is(Foo.class)) {\n      foo = any.unpack(Foo.class);\n    }\n\n Example 3: Pack and unpack a message in Python.\n\n    foo = Foo(...)\n    any = Any()\n    any.Pack(foo)\n    ...\n    if any.Is(Foo.DESCRIPTOR):\n      any.Unpack(foo)\n      ...\n\n Example 4: Pack and unpack a message in Go\n\n     foo := \u0026pb.Foo{...}\n     any, err := ptypes.MarshalAny(foo)\n     ...\n     foo := \u0026pb.Foo{}\n     if err := ptypes.UnmarshalAny(any, foo); err != nil {\n       ...\n     }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n    package google.profile;\n    message Person {\n      string first_name = 1;\n      string last_name = 2;\n    }\n\n    {\n      \"@type\": \"type.googleapis.com/google.profile.Person\",\n      \"firstName\": \u003cstring\u003e,\n      \"lastName\": \u003cstring\u003e\n    }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n    {\n      \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n      \"value\": \"1.212s\"\n    }"
    },
-    "rpcStatus": {
+    "runtimeStreamError": {
      "type": "object",
      "properties": {
-        "code": {
+        "grpc_code": {
          "type": "integer",
-          "format": "int32",
-          "description": "The status code, which should be an enum value of [google.rpc.Code][google.rpc.Code]."
+          "format": "int32"
+        },
+        "http_code": {
+          "type": "integer",
+          "format": "int32"
        },
        "message": {
-          "type": "string",
-          "description": "A developer-facing error message, which should be in English. Any\nuser-facing error message should be localized and sent in the\n[google.rpc.Status.details][google.rpc.Status.details] field, or localized by the client."
+          "type": "string"
+        },
+        "http_status": {
+          "type": "string"
        },
        "details": {
          "type": "array",
          "items": {
            "$ref": "#/definitions/protobufAny"
-          },
-          "description": "A list of messages that carry the error details.  There is a common set of\nmessage types for APIs to use."
+          }
+        }
+      }
+    }
+  },
+  "x-stream-definitions": {
+    "openmatchFetchMatchesResponse": {
+      "type": "object",
+      "properties": {
+        "result": {
+          "$ref": "#/definitions/openmatchFetchMatchesResponse"
+        },
+        "error": {
+          "$ref": "#/definitions/runtimeStreamError"
        }
      },
-      "description": "The `Status` type defines a logical error model that is suitable for\ndifferent programming environments, including REST APIs and RPC APIs. It is\nused by [gRPC](https://github.com/grpc). Each `Status` message contains\nthree pieces of data: error code, error message, and error details.\n\nYou can find out more about this error model and how to work with it in the\n[API Design Guide](https://cloud.google.com/apis/design/errors)."
+      "title": "Stream result of openmatchFetchMatchesResponse"
    }
  },
  "externalDocs": {
--- a/api/evaluator.proto
+++ b/api/evaluator.proto
@ -19,9 +19,9 @@ option csharp_namespace = "OpenMatch";

 import "api/messages.proto";
 import "google/api/annotations.proto";
-import "protoc-gen-openapiv2/options/annotations.proto";
+import "protoc-gen-swagger/options/annotations.proto";

-option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
+option (grpc.gateway.protoc_gen_swagger.options.openapiv2_swagger) = {
  info: {
    title: "Evaluator"
    version: "1.0"
@ -52,7 +52,7 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
  }
  // TODO Add annotations for security_defintiions.
  // See
-  // https://github.com/grpc-ecosystem/grpc-gateway/blob/master/examples/internal/proto/examplepb/a_bit_of_everything.proto
+  // https://github.com/grpc-ecosystem/grpc-gateway/blob/master/examples/proto/examplepb/a_bit_of_everything.proto
 };

 message EvaluateRequest {
--- a/api/evaluator.swagger.json
+++ b/api/evaluator.swagger.json
@ -13,11 +13,6 @@
      "url": "https://github.com/googleforgames/open-match/blob/master/LICENSE"
    }
  },
-  "tags": [
-    {
-      "name": "Evaluator"
-    }
-  ],
  "schemes": [
    "http",
    "https"
@ -32,21 +27,12 @@
    "/v1/evaluator/matches:evaluate": {
      "post": {
        "summary": "Evaluate evaluates a list of proposed matches based on quality, collision status, and etc, then shortlist the matches and returns the final results.",
-        "operationId": "Evaluator_Evaluate",
+        "operationId": "Evaluate",
        "responses": {
          "200": {
            "description": "A successful response.(streaming responses)",
            "schema": {
-              "type": "object",
-              "properties": {
-                "result": {
-                  "$ref": "#/definitions/openmatchEvaluateResponse"
-                },
-                "error": {
-                  "$ref": "#/definitions/rpcStatus"
-                }
-              },
-              "title": "Stream result of openmatchEvaluateResponse"
+              "$ref": "#/x-stream-definitions/openmatchEvaluateResponse"
            }
          },
          "404": {
@ -55,12 +41,6 @@
              "type": "string",
              "format": "string"
            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
-            }
          }
        },
        "parameters": [
@ -96,38 +76,7 @@
          "description": "Customized information not inspected by Open Match, to be used by the match\nmaking function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
        }
      },
-      "description": "An Assignment represents a game server assignment associated with a Ticket.\nOpen Match does not require or inspect any fields on assignment."
-    },
-    "openmatchBackfill": {
-      "type": "object",
-      "properties": {
-        "id": {
-          "type": "string",
-          "description": "Id represents an auto-generated Id issued by Open Match."
-        },
-        "search_fields": {
-          "$ref": "#/definitions/openmatchSearchFields",
-          "description": "Search fields are the fields which Open Match is aware of, and can be used\nwhen specifying filters."
-        },
-        "extensions": {
-          "type": "object",
-          "additionalProperties": {
-            "$ref": "#/definitions/protobufAny"
-          },
-          "description": "Customized information not inspected by Open Match, to be used by\nthe Match Function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
-        },
-        "create_time": {
-          "type": "string",
-          "format": "date-time",
-          "description": "Create time is the time the Ticket was created. It is populated by Open\nMatch at the time of Ticket creation."
-        },
-        "generation": {
-          "type": "string",
-          "format": "int64",
-          "description": "Generation gets incremented on GameServers update operations.\nPrevents the MMF from overriding a newer version from the game server.\nDo NOT read or write to this field, it is for internal tracking, and changing the value will cause bugs."
-        }
-      },
-      "description": "Represents a backfill entity which is used to fill partially full matches.\n\nBETA FEATURE WARNING:  This call and the associated Request and Response\nmessages are not finalized and still subject to possible change or removal."
+      "description": "An Assignment represents a game server assignment associated with a Ticket. Open\nmatch does not require or inspect any fields on assignment."
    },
    "openmatchEvaluateRequest": {
      "type": "object",
@ -175,14 +124,6 @@
            "$ref": "#/definitions/protobufAny"
          },
          "description": "Customized information not inspected by Open Match, to be used by the match\nmaking function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
-        },
-        "backfill": {
-          "$ref": "#/definitions/openmatchBackfill",
-          "description": "Backfill request which contains additional information to the match\nand contains an association to a GameServer.\nBETA FEATURE WARNING: This field is not finalized and still subject\nto possible change or removal."
-        },
-        "allocate_gameserver": {
-          "type": "boolean",
-          "description": "AllocateGameServer signalise Director that Backfill is new and it should \nallocate a GameServer, this Backfill would be assigned.\nBETA FEATURE WARNING: This field is not finalized and still subject\nto possible change or removal."
        }
      },
      "description": "A Match is used to represent a completed match object. It can be generated by\na MatchFunction as a proposal or can be returned by OpenMatch as a result in\nresponse to the FetchMatches call.\nWhen a match is returned by the FetchMatches call, it should contain at least\none ticket to be considered as valid."
@ -224,7 +165,7 @@
        },
        "assignment": {
          "$ref": "#/definitions/openmatchAssignment",
-          "description": "An Assignment represents a game server assignment associated with a Ticket,\nor whatever finalized matched state means for your use case.\nOpen Match does not require or inspect any fields on Assignment."
+          "description": "An Assignment represents a game server assignment associated with a Ticket.\nOpen Match does not require or inspect any fields on Assignment."
        },
        "search_fields": {
          "$ref": "#/definitions/openmatchSearchFields",
@ -236,14 +177,9 @@
            "$ref": "#/definitions/protobufAny"
          },
          "description": "Customized information not inspected by Open Match, to be used by the match\nmaking function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
-        },
-        "create_time": {
-          "type": "string",
-          "format": "date-time",
-          "description": "Create time is the time the Ticket was created. It is populated by Open\nMatch at the time of Ticket creation."
        }
      },
-      "description": "A Ticket is a basic matchmaking entity in Open Match. A Ticket may represent\nan individual 'Player', a 'Group' of players, or any other concepts unique to\nyour use case. Open Match will not interpret what the Ticket represents but\njust treat it as a matchmaking unit with a set of SearchFields. Open Match\nstores the Ticket in state storage and enables an Assignment to be set on the\nTicket."
+      "description": "A Ticket is a basic matchmaking entity in Open Match. A Ticket represents either an\nindividual 'Player' or a 'Group' of players. Open Match will not interpret\nwhat the Ticket represents but just treat it as a matchmaking unit with a set\nof SearchFields. Open Match stores the Ticket in state storage and enables an\nAssignment to be associated with this Ticket."
    },
    "protobufAny": {
      "type": "object",
@ -260,27 +196,44 @@
      },
      "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n    Foo foo = ...;\n    Any any;\n    any.PackFrom(foo);\n    ...\n    if (any.UnpackTo(\u0026foo)) {\n      ...\n    }\n\nExample 2: Pack and unpack a message in Java.\n\n    Foo foo = ...;\n    Any any = Any.pack(foo);\n    ...\n    if (any.is(Foo.class)) {\n      foo = any.unpack(Foo.class);\n    }\n\n Example 3: Pack and unpack a message in Python.\n\n    foo = Foo(...)\n    any = Any()\n    any.Pack(foo)\n    ...\n    if any.Is(Foo.DESCRIPTOR):\n      any.Unpack(foo)\n      ...\n\n Example 4: Pack and unpack a message in Go\n\n     foo := \u0026pb.Foo{...}\n     any, err := ptypes.MarshalAny(foo)\n     ...\n     foo := \u0026pb.Foo{}\n     if err := ptypes.UnmarshalAny(any, foo); err != nil {\n       ...\n     }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n    package google.profile;\n    message Person {\n      string first_name = 1;\n      string last_name = 2;\n    }\n\n    {\n      \"@type\": \"type.googleapis.com/google.profile.Person\",\n      \"firstName\": \u003cstring\u003e,\n      \"lastName\": \u003cstring\u003e\n    }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n    {\n      \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n      \"value\": \"1.212s\"\n    }"
    },
-    "rpcStatus": {
+    "runtimeStreamError": {
      "type": "object",
      "properties": {
-        "code": {
+        "grpc_code": {
          "type": "integer",
-          "format": "int32",
-          "description": "The status code, which should be an enum value of [google.rpc.Code][google.rpc.Code]."
+          "format": "int32"
+        },
+        "http_code": {
+          "type": "integer",
+          "format": "int32"
        },
        "message": {
-          "type": "string",
-          "description": "A developer-facing error message, which should be in English. Any\nuser-facing error message should be localized and sent in the\n[google.rpc.Status.details][google.rpc.Status.details] field, or localized by the client."
+          "type": "string"
+        },
+        "http_status": {
+          "type": "string"
        },
        "details": {
          "type": "array",
          "items": {
            "$ref": "#/definitions/protobufAny"
-          },
-          "description": "A list of messages that carry the error details.  There is a common set of\nmessage types for APIs to use."
+          }
+        }
+      }
+    }
+  },
+  "x-stream-definitions": {
+    "openmatchEvaluateResponse": {
+      "type": "object",
+      "properties": {
+        "result": {
+          "$ref": "#/definitions/openmatchEvaluateResponse"
+        },
+        "error": {
+          "$ref": "#/definitions/runtimeStreamError"
        }
      },
-      "description": "The `Status` type defines a logical error model that is suitable for\ndifferent programming environments, including REST APIs and RPC APIs. It is\nused by [gRPC](https://github.com/grpc). Each `Status` message contains\nthree pieces of data: error code, error message, and error details.\n\nYou can find out more about this error model and how to work with it in the\n[API Design Guide](https://cloud.google.com/apis/design/errors)."
+      "title": "Stream result of openmatchEvaluateResponse"
    }
  },
  "externalDocs": {
--- a/api/frontend.proto
+++ b/api/frontend.proto
@ -19,10 +19,9 @@ option csharp_namespace = "OpenMatch";

 import "api/messages.proto";
 import "google/api/annotations.proto";
-import "protoc-gen-openapiv2/options/annotations.proto";
-import "google/protobuf/empty.proto";
+import "protoc-gen-swagger/options/annotations.proto";

-option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
+option (grpc.gateway.protoc_gen_swagger.options.openapiv2_swagger) = {
  info: {
    title: "Frontend"
    version: "1.0"
@ -53,7 +52,7 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
  }
  // TODO Add annotations for security_defintiions.
  // See
-  // https://github.com/grpc-ecosystem/grpc-gateway/blob/master/examples/internal/proto/examplepb/a_bit_of_everything.proto
+  // https://github.com/grpc-ecosystem/grpc-gateway/blob/master/examples/proto/examplepb/a_bit_of_everything.proto
 };

 message CreateTicketRequest {
@ -61,84 +60,40 @@ message CreateTicketRequest {
  Ticket ticket = 1;
 }

+message CreateTicketResponse {
+  // A Ticket object with TicketId generated.
+  Ticket ticket = 1;
+}
+
 message DeleteTicketRequest {
  // A TicketId of a generated Ticket to be deleted.
  string ticket_id = 1;
 }

+message DeleteTicketResponse {}
+
 message GetTicketRequest {
  // A TicketId of a generated Ticket.
  string ticket_id = 1;
 }

-message WatchAssignmentsRequest {
+message GetAssignmentsRequest {
  // A TicketId of a generated Ticket to get updates on.
  string ticket_id = 1;
 }

-message WatchAssignmentsResponse {
+message GetAssignmentsResponse {
  // An updated Assignment of the requested Ticket.
  Assignment assignment = 1;
 }

-// BETA FEATURE WARNING: This Request message is not finalized and still subject
-// to possible change or removal.
-message AcknowledgeBackfillRequest {
-  // An existing ID of Backfill to acknowledge.
-  string backfill_id = 1;
-
-  // An updated Assignment of the requested Backfill.
-  Assignment assignment = 2;
-}
-
-// BETA FEATURE WARNING: This Request message is not finalized and still subject
-// to possible change or removal.
-message AcknowledgeBackfillResponse {
-  // The Backfill that was acknowledged.
-  Backfill backfill = 1;
-
-  // All of the Tickets that were successfully assigned
-  repeated Ticket tickets = 2;
-}
-
-// BETA FEATURE WARNING: This Request message is not finalized and still subject
-// to possible change or removal.
-message CreateBackfillRequest {
-  // An empty Backfill object.
-  Backfill backfill = 1;
-}
-
-// BETA FEATURE WARNING: This Request message is not finalized and still subject
-// to possible change or removal.
-message DeleteBackfillRequest {
-  // An existing ID of Backfill to delete.
-  string backfill_id = 1;
-}
-
-// BETA FEATURE WARNING: This Request message is not finalized and still subject
-// to possible change or removal.
-message GetBackfillRequest {
-  // An existing ID of Backfill to retrieve.
-  string backfill_id = 1;
-}
-
-// UpdateBackfillRequest - update searchFields, extensions and set assignment.
-// 
-// BETA FEATURE WARNING: This Request message is not finalized and still subject
-// to possible change or removal.
-message UpdateBackfillRequest {
-  // A Backfill object with ID set and fields to update.
-  Backfill backfill = 1;
-}
-
-
 // The FrontendService implements APIs to manage and query status of a Tickets.
 service FrontendService {
  // CreateTicket assigns an unique TicketId to the input Ticket and record it in state storage.
  // A ticket is considered as ready for matchmaking once it is created.
  //   - If a TicketId exists in a Ticket request, an auto-generated TicketId will override this field.
  //   - If SearchFields exist in a Ticket, CreateTicket will also index these fields such that one can query the ticket with query.QueryTickets function.
-  rpc CreateTicket(CreateTicketRequest) returns (Ticket) {
+  rpc CreateTicket(CreateTicketRequest) returns (CreateTicketResponse) {
    option (google.api.http) = {
      post: "/v1/frontendservice/tickets"
      body: "*"
@ -146,8 +101,10 @@ service FrontendService {
  }

  // DeleteTicket immediately stops Open Match from using the Ticket for matchmaking and removes the Ticket from state storage.
-  // The client should delete the Ticket when finished matchmaking with it. 
-  rpc DeleteTicket(DeleteTicketRequest) returns (google.protobuf.Empty) {
+  // The client must delete the Ticket when finished matchmaking with it. 
+  //   - If SearchFields exist in a Ticket, DeleteTicket will deindex the fields lazily.
+  // Users may still be able to assign/get a ticket after calling DeleteTicket on it.
+  rpc DeleteTicket(DeleteTicketRequest) returns (DeleteTicketResponse) {
    option (google.api.http) = {
      delete: "/v1/frontendservice/tickets/{ticket_id}"
    };
@ -160,63 +117,12 @@ service FrontendService {
    };
  }

-  // WatchAssignments stream back Assignment of the specified TicketId if it is updated.
+  // GetAssignments stream back Assignment of the specified TicketId if it is updated.
  //   - If the Assignment is not updated, GetAssignment will retry using the configured backoff strategy. 
-  rpc WatchAssignments(WatchAssignmentsRequest)
-      returns (stream WatchAssignmentsResponse) {
+  rpc GetAssignments(GetAssignmentsRequest)
+      returns (stream GetAssignmentsResponse) {
    option (google.api.http) = {
      get: "/v1/frontendservice/tickets/{ticket_id}/assignments"
    };
  }
-
-  // AcknowledgeBackfill is used to notify OpenMatch about GameServer connection info
-  // This triggers an assignment process.
-  // BETA FEATURE WARNING: This call and the associated Request and Response
-  // messages are not finalized and still subject to possible change or removal.
-  rpc AcknowledgeBackfill(AcknowledgeBackfillRequest) returns (AcknowledgeBackfillResponse) {
-    option (google.api.http) = {
-      post: "/v1/frontendservice/backfills/{backfill_id}/acknowledge"
-      body: "*"
-    };
-  }
-
-  // CreateBackfill creates a new Backfill object.
-  // BETA FEATURE WARNING:  This call and the associated Request and Response
-  // messages are not finalized and still subject to possible change or removal.
-  rpc CreateBackfill(CreateBackfillRequest) returns (Backfill) {
-    option (google.api.http) = {
-      post: "/v1/frontendservice/backfills"
-      body: "*"
-    };
-  }
-
-  // DeleteBackfill receives a backfill ID and deletes its resource.
-  // Any tickets waiting for this backfill will be returned to the active pool, no longer pending.
-  // BETA FEATURE WARNING:  This call and the associated Request and Response
-  // messages are not finalized and still subject to possible change or removal.
-  rpc DeleteBackfill(DeleteBackfillRequest) returns (google.protobuf.Empty) {
-    option (google.api.http) = {
-      delete: "/v1/frontendservice/backfills/{backfill_id}"
-    };
-  }
-
-  // GetBackfill returns a backfill object by its ID.
-  // BETA FEATURE WARNING:  This call and the associated Request and Response
-  // messages are not finalized and still subject to possible change or removal.
-  rpc GetBackfill(GetBackfillRequest) returns (Backfill) {
-    option (google.api.http) = {
-      get: "/v1/frontendservice/backfills/{backfill_id}"
-    };
-  }
-  
-  // UpdateBackfill updates search_fields and extensions for the backfill with the provided id.
-  // Any tickets waiting for this backfill will be returned to the active pool, no longer pending.
-  // BETA FEATURE WARNING:  This call and the associated Request and Response
-  // messages are not finalized and still subject to possible change or removal.
-  rpc UpdateBackfill(UpdateBackfillRequest) returns (Backfill) {
-    option (google.api.http) = {
-      patch: "/v1/frontendservice/backfills"
-      body: "*"
-    };
-  }
 }
--- a/api/frontend.swagger.json
+++ b/api/frontend.swagger.json
@ -13,11 +13,6 @@
      "url": "https://github.com/googleforgames/open-match/blob/master/LICENSE"
    }
  },
-  "tags": [
-    {
-      "name": "FrontendService"
-    }
-  ],
  "schemes": [
    "http",
    "https"
@ -29,216 +24,15 @@
    "application/json"
  ],
  "paths": {
-    "/v1/frontendservice/backfills": {
-      "post": {
-        "summary": "CreateBackfill creates a new Backfill object.\nBETA FEATURE WARNING:  This call and the associated Request and Response\nmessages are not finalized and still subject to possible change or removal.",
-        "operationId": "FrontendService_CreateBackfill",
-        "responses": {
-          "200": {
-            "description": "A successful response.",
-            "schema": {
-              "$ref": "#/definitions/openmatchBackfill"
-            }
-          },
-          "404": {
-            "description": "Returned when the resource does not exist.",
-            "schema": {
-              "type": "string",
-              "format": "string"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
-            }
-          }
-        },
-        "parameters": [
-          {
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/openmatchCreateBackfillRequest"
-            }
-          }
-        ],
-        "tags": [
-          "FrontendService"
-        ]
-      },
-      "patch": {
-        "summary": "UpdateBackfill updates search_fields and extensions for the backfill with the provided id.\nAny tickets waiting for this backfill will be returned to the active pool, no longer pending.\nBETA FEATURE WARNING:  This call and the associated Request and Response\nmessages are not finalized and still subject to possible change or removal.",
-        "operationId": "FrontendService_UpdateBackfill",
-        "responses": {
-          "200": {
-            "description": "A successful response.",
-            "schema": {
-              "$ref": "#/definitions/openmatchBackfill"
-            }
-          },
-          "404": {
-            "description": "Returned when the resource does not exist.",
-            "schema": {
-              "type": "string",
-              "format": "string"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
-            }
-          }
-        },
-        "parameters": [
-          {
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/openmatchUpdateBackfillRequest"
-            }
-          }
-        ],
-        "tags": [
-          "FrontendService"
-        ]
-      }
-    },
-    "/v1/frontendservice/backfills/{backfill_id}": {
-      "get": {
-        "summary": "GetBackfill returns a backfill object by its ID.\nBETA FEATURE WARNING:  This call and the associated Request and Response\nmessages are not finalized and still subject to possible change or removal.",
-        "operationId": "FrontendService_GetBackfill",
-        "responses": {
-          "200": {
-            "description": "A successful response.",
-            "schema": {
-              "$ref": "#/definitions/openmatchBackfill"
-            }
-          },
-          "404": {
-            "description": "Returned when the resource does not exist.",
-            "schema": {
-              "type": "string",
-              "format": "string"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
-            }
-          }
-        },
-        "parameters": [
-          {
-            "name": "backfill_id",
-            "description": "An existing ID of Backfill to retrieve.",
-            "in": "path",
-            "required": true,
-            "type": "string"
-          }
-        ],
-        "tags": [
-          "FrontendService"
-        ]
-      },
-      "delete": {
-        "summary": "DeleteBackfill receives a backfill ID and deletes its resource.\nAny tickets waiting for this backfill will be returned to the active pool, no longer pending.\nBETA FEATURE WARNING:  This call and the associated Request and Response\nmessages are not finalized and still subject to possible change or removal.",
-        "operationId": "FrontendService_DeleteBackfill",
-        "responses": {
-          "200": {
-            "description": "A successful response.",
-            "schema": {
-              "properties": {}
-            }
-          },
-          "404": {
-            "description": "Returned when the resource does not exist.",
-            "schema": {
-              "type": "string",
-              "format": "string"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
-            }
-          }
-        },
-        "parameters": [
-          {
-            "name": "backfill_id",
-            "description": "An existing ID of Backfill to delete.",
-            "in": "path",
-            "required": true,
-            "type": "string"
-          }
-        ],
-        "tags": [
-          "FrontendService"
-        ]
-      }
-    },
-    "/v1/frontendservice/backfills/{backfill_id}/acknowledge": {
-      "post": {
-        "summary": "AcknowledgeBackfill is used to notify OpenMatch about GameServer connection info\nThis triggers an assignment process.\nBETA FEATURE WARNING: This call and the associated Request and Response\nmessages are not finalized and still subject to possible change or removal.",
-        "operationId": "FrontendService_AcknowledgeBackfill",
-        "responses": {
-          "200": {
-            "description": "A successful response.",
-            "schema": {
-              "$ref": "#/definitions/openmatchAcknowledgeBackfillResponse"
-            }
-          },
-          "404": {
-            "description": "Returned when the resource does not exist.",
-            "schema": {
-              "type": "string",
-              "format": "string"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
-            }
-          }
-        },
-        "parameters": [
-          {
-            "name": "backfill_id",
-            "description": "An existing ID of Backfill to acknowledge.",
-            "in": "path",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/openmatchAcknowledgeBackfillRequest"
-            }
-          }
-        ],
-        "tags": [
-          "FrontendService"
-        ]
-      }
-    },
    "/v1/frontendservice/tickets": {
      "post": {
        "summary": "CreateTicket assigns an unique TicketId to the input Ticket and record it in state storage.\nA ticket is considered as ready for matchmaking once it is created.\n  - If a TicketId exists in a Ticket request, an auto-generated TicketId will override this field.\n  - If SearchFields exist in a Ticket, CreateTicket will also index these fields such that one can query the ticket with query.QueryTickets function.",
-        "operationId": "FrontendService_CreateTicket",
+        "operationId": "CreateTicket",
        "responses": {
          "200": {
            "description": "A successful response.",
            "schema": {
-              "$ref": "#/definitions/openmatchTicket"
+              "$ref": "#/definitions/openmatchCreateTicketResponse"
            }
          },
          "404": {
@ -247,12 +41,6 @@
              "type": "string",
              "format": "string"
            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
-            }
          }
        },
        "parameters": [
@ -273,7 +61,7 @@
    "/v1/frontendservice/tickets/{ticket_id}": {
      "get": {
        "summary": "GetTicket get the Ticket associated with the specified TicketId.",
-        "operationId": "FrontendService_GetTicket",
+        "operationId": "GetTicket",
        "responses": {
          "200": {
            "description": "A successful response.",
@ -287,12 +75,6 @@
              "type": "string",
              "format": "string"
            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
-            }
          }
        },
        "parameters": [
@ -309,13 +91,13 @@
        ]
      },
      "delete": {
-        "summary": "DeleteTicket immediately stops Open Match from using the Ticket for matchmaking and removes the Ticket from state storage.\nThe client should delete the Ticket when finished matchmaking with it.",
-        "operationId": "FrontendService_DeleteTicket",
+        "summary": "DeleteTicket immediately stops Open Match from using the Ticket for matchmaking and removes the Ticket from state storage.\nThe client must delete the Ticket when finished matchmaking with it. \n  - If SearchFields exist in a Ticket, DeleteTicket will deindex the fields lazily.\nUsers may still be able to assign/get a ticket after calling DeleteTicket on it.",
+        "operationId": "DeleteTicket",
        "responses": {
          "200": {
            "description": "A successful response.",
            "schema": {
-              "properties": {}
+              "$ref": "#/definitions/openmatchDeleteTicketResponse"
            }
          },
          "404": {
@ -324,12 +106,6 @@
              "type": "string",
              "format": "string"
            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
-            }
          }
        },
        "parameters": [
@ -348,22 +124,13 @@
    },
    "/v1/frontendservice/tickets/{ticket_id}/assignments": {
      "get": {
-        "summary": "WatchAssignments stream back Assignment of the specified TicketId if it is updated.\n  - If the Assignment is not updated, GetAssignment will retry using the configured backoff strategy.",
-        "operationId": "FrontendService_WatchAssignments",
+        "summary": "GetAssignments stream back Assignment of the specified TicketId if it is updated.\n  - If the Assignment is not updated, GetAssignment will retry using the configured backoff strategy.",
+        "operationId": "GetAssignments",
        "responses": {
          "200": {
            "description": "A successful response.(streaming responses)",
            "schema": {
-              "type": "object",
-              "properties": {
-                "result": {
-                  "$ref": "#/definitions/openmatchWatchAssignmentsResponse"
-                },
-                "error": {
-                  "$ref": "#/definitions/rpcStatus"
-                }
-              },
-              "title": "Stream result of openmatchWatchAssignmentsResponse"
+              "$ref": "#/x-stream-definitions/openmatchGetAssignmentsResponse"
            }
          },
          "404": {
@ -372,12 +139,6 @@
              "type": "string",
              "format": "string"
            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
-            }
          }
        },
        "parameters": [
@ -396,37 +157,6 @@
    }
  },
  "definitions": {
-    "openmatchAcknowledgeBackfillRequest": {
-      "type": "object",
-      "properties": {
-        "backfill_id": {
-          "type": "string",
-          "description": "An existing ID of Backfill to acknowledge."
-        },
-        "assignment": {
-          "$ref": "#/definitions/openmatchAssignment",
-          "description": "An updated Assignment of the requested Backfill."
-        }
-      },
-      "description": "BETA FEATURE WARNING: This Request message is not finalized and still subject\nto possible change or removal."
-    },
-    "openmatchAcknowledgeBackfillResponse": {
-      "type": "object",
-      "properties": {
-        "backfill": {
-          "$ref": "#/definitions/openmatchBackfill",
-          "description": "The Backfill that was acknowledged."
-        },
-        "tickets": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/openmatchTicket"
-          },
-          "title": "All of the Tickets that were successfully assigned"
-        }
-      },
-      "description": "BETA FEATURE WARNING: This Request message is not finalized and still subject\nto possible change or removal."
-    },
    "openmatchAssignment": {
      "type": "object",
      "properties": {
@ -442,48 +172,7 @@
          "description": "Customized information not inspected by Open Match, to be used by the match\nmaking function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
        }
      },
-      "description": "An Assignment represents a game server assignment associated with a Ticket.\nOpen Match does not require or inspect any fields on assignment."
-    },
-    "openmatchBackfill": {
-      "type": "object",
-      "properties": {
-        "id": {
-          "type": "string",
-          "description": "Id represents an auto-generated Id issued by Open Match."
-        },
-        "search_fields": {
-          "$ref": "#/definitions/openmatchSearchFields",
-          "description": "Search fields are the fields which Open Match is aware of, and can be used\nwhen specifying filters."
-        },
-        "extensions": {
-          "type": "object",
-          "additionalProperties": {
-            "$ref": "#/definitions/protobufAny"
-          },
-          "description": "Customized information not inspected by Open Match, to be used by\nthe Match Function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
-        },
-        "create_time": {
-          "type": "string",
-          "format": "date-time",
-          "description": "Create time is the time the Ticket was created. It is populated by Open\nMatch at the time of Ticket creation."
-        },
-        "generation": {
-          "type": "string",
-          "format": "int64",
-          "description": "Generation gets incremented on GameServers update operations.\nPrevents the MMF from overriding a newer version from the game server.\nDo NOT read or write to this field, it is for internal tracking, and changing the value will cause bugs."
-        }
-      },
-      "description": "Represents a backfill entity which is used to fill partially full matches.\n\nBETA FEATURE WARNING:  This call and the associated Request and Response\nmessages are not finalized and still subject to possible change or removal."
-    },
-    "openmatchCreateBackfillRequest": {
-      "type": "object",
-      "properties": {
-        "backfill": {
-          "$ref": "#/definitions/openmatchBackfill",
-          "description": "An empty Backfill object."
-        }
-      },
-      "description": "BETA FEATURE WARNING: This Request message is not finalized and still subject\nto possible change or removal."
+      "description": "An Assignment represents a game server assignment associated with a Ticket. Open\nmatch does not require or inspect any fields on assignment."
    },
    "openmatchCreateTicketRequest": {
      "type": "object",
@ -494,6 +183,27 @@
        }
      }
    },
+    "openmatchCreateTicketResponse": {
+      "type": "object",
+      "properties": {
+        "ticket": {
+          "$ref": "#/definitions/openmatchTicket",
+          "description": "A Ticket object with TicketId generated."
+        }
+      }
+    },
+    "openmatchDeleteTicketResponse": {
+      "type": "object"
+    },
+    "openmatchGetAssignmentsResponse": {
+      "type": "object",
+      "properties": {
+        "assignment": {
+          "$ref": "#/definitions/openmatchAssignment",
+          "description": "An updated Assignment of the requested Ticket."
+        }
+      }
+    },
    "openmatchSearchFields": {
      "type": "object",
      "properties": {
@ -531,7 +241,7 @@
        },
        "assignment": {
          "$ref": "#/definitions/openmatchAssignment",
-          "description": "An Assignment represents a game server assignment associated with a Ticket,\nor whatever finalized matched state means for your use case.\nOpen Match does not require or inspect any fields on Assignment."
+          "description": "An Assignment represents a game server assignment associated with a Ticket.\nOpen Match does not require or inspect any fields on Assignment."
        },
        "search_fields": {
          "$ref": "#/definitions/openmatchSearchFields",
@ -543,33 +253,9 @@
            "$ref": "#/definitions/protobufAny"
          },
          "description": "Customized information not inspected by Open Match, to be used by the match\nmaking function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
-        },
-        "create_time": {
-          "type": "string",
-          "format": "date-time",
-          "description": "Create time is the time the Ticket was created. It is populated by Open\nMatch at the time of Ticket creation."
        }
      },
-      "description": "A Ticket is a basic matchmaking entity in Open Match. A Ticket may represent\nan individual 'Player', a 'Group' of players, or any other concepts unique to\nyour use case. Open Match will not interpret what the Ticket represents but\njust treat it as a matchmaking unit with a set of SearchFields. Open Match\nstores the Ticket in state storage and enables an Assignment to be set on the\nTicket."
-    },
-    "openmatchUpdateBackfillRequest": {
-      "type": "object",
-      "properties": {
-        "backfill": {
-          "$ref": "#/definitions/openmatchBackfill",
-          "description": "A Backfill object with ID set and fields to update."
-        }
-      },
-      "description": "UpdateBackfillRequest - update searchFields, extensions and set assignment.\n\nBETA FEATURE WARNING: This Request message is not finalized and still subject\nto possible change or removal."
-    },
-    "openmatchWatchAssignmentsResponse": {
-      "type": "object",
-      "properties": {
-        "assignment": {
-          "$ref": "#/definitions/openmatchAssignment",
-          "description": "An updated Assignment of the requested Ticket."
-        }
-      }
+      "description": "A Ticket is a basic matchmaking entity in Open Match. A Ticket represents either an\nindividual 'Player' or a 'Group' of players. Open Match will not interpret\nwhat the Ticket represents but just treat it as a matchmaking unit with a set\nof SearchFields. Open Match stores the Ticket in state storage and enables an\nAssignment to be associated with this Ticket."
    },
    "protobufAny": {
      "type": "object",
@ -586,27 +272,44 @@
      },
      "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n    Foo foo = ...;\n    Any any;\n    any.PackFrom(foo);\n    ...\n    if (any.UnpackTo(\u0026foo)) {\n      ...\n    }\n\nExample 2: Pack and unpack a message in Java.\n\n    Foo foo = ...;\n    Any any = Any.pack(foo);\n    ...\n    if (any.is(Foo.class)) {\n      foo = any.unpack(Foo.class);\n    }\n\n Example 3: Pack and unpack a message in Python.\n\n    foo = Foo(...)\n    any = Any()\n    any.Pack(foo)\n    ...\n    if any.Is(Foo.DESCRIPTOR):\n      any.Unpack(foo)\n      ...\n\n Example 4: Pack and unpack a message in Go\n\n     foo := \u0026pb.Foo{...}\n     any, err := ptypes.MarshalAny(foo)\n     ...\n     foo := \u0026pb.Foo{}\n     if err := ptypes.UnmarshalAny(any, foo); err != nil {\n       ...\n     }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n    package google.profile;\n    message Person {\n      string first_name = 1;\n      string last_name = 2;\n    }\n\n    {\n      \"@type\": \"type.googleapis.com/google.profile.Person\",\n      \"firstName\": \u003cstring\u003e,\n      \"lastName\": \u003cstring\u003e\n    }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n    {\n      \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n      \"value\": \"1.212s\"\n    }"
    },
-    "rpcStatus": {
+    "runtimeStreamError": {
      "type": "object",
      "properties": {
-        "code": {
+        "grpc_code": {
          "type": "integer",
-          "format": "int32",
-          "description": "The status code, which should be an enum value of [google.rpc.Code][google.rpc.Code]."
+          "format": "int32"
+        },
+        "http_code": {
+          "type": "integer",
+          "format": "int32"
        },
        "message": {
-          "type": "string",
-          "description": "A developer-facing error message, which should be in English. Any\nuser-facing error message should be localized and sent in the\n[google.rpc.Status.details][google.rpc.Status.details] field, or localized by the client."
+          "type": "string"
+        },
+        "http_status": {
+          "type": "string"
        },
        "details": {
          "type": "array",
          "items": {
            "$ref": "#/definitions/protobufAny"
-          },
-          "description": "A list of messages that carry the error details.  There is a common set of\nmessage types for APIs to use."
+          }
+        }
+      }
+    }
+  },
+  "x-stream-definitions": {
+    "openmatchGetAssignmentsResponse": {
+      "type": "object",
+      "properties": {
+        "result": {
+          "$ref": "#/definitions/openmatchGetAssignmentsResponse"
+        },
+        "error": {
+          "$ref": "#/definitions/runtimeStreamError"
        }
      },
-      "description": "The `Status` type defines a logical error model that is suitable for\ndifferent programming environments, including REST APIs and RPC APIs. It is\nused by [gRPC](https://github.com/grpc). Each `Status` message contains\nthree pieces of data: error code, error message, and error details.\n\nYou can find out more about this error model and how to work with it in the\n[API Design Guide](https://cloud.google.com/apis/design/errors)."
+      "title": "Stream result of openmatchGetAssignmentsResponse"
    }
  },
  "externalDocs": {
--- a/api/matchfunction.proto
+++ b/api/matchfunction.proto
@ -19,9 +19,9 @@ option csharp_namespace = "OpenMatch";

 import "api/messages.proto";
 import "google/api/annotations.proto";
-import "protoc-gen-openapiv2/options/annotations.proto";
+import "protoc-gen-swagger/options/annotations.proto";

-option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
+option (grpc.gateway.protoc_gen_swagger.options.openapiv2_swagger) = {
  info: {
    title: "Match Function"
    version: "1.0"
@ -69,9 +69,8 @@ message RunResponse {
 // The MatchFunction service implements APIs to run user-defined matchmaking logics.
 service MatchFunction {
  // DO NOT CALL THIS FUNCTION MANUALLY. USE backend.FetchMatches INSTEAD.
-  // Run pulls Tickets that satisfy Profile constraints from QueryService,
-  // runs matchmaking logic against them, then constructs and streams back
-  // match candidates to the Backend service.
+  // Run pulls Tickets that satisify Profile constraints from QueryService, runs matchmaking logics against them, then
+  // constructs and streams back match candidates to the Backend service.
  rpc Run(RunRequest) returns (stream RunResponse) {
    option (google.api.http) = {
      post: "/v1/matchfunction:run"
--- a/api/matchfunction.swagger.json
+++ b/api/matchfunction.swagger.json
@ -13,11 +13,6 @@
      "url": "https://github.com/googleforgames/open-match/blob/master/LICENSE"
    }
  },
-  "tags": [
-    {
-      "name": "MatchFunction"
-    }
-  ],
  "schemes": [
    "http",
    "https"
@ -31,22 +26,13 @@
  "paths": {
    "/v1/matchfunction:run": {
      "post": {
-        "summary": "DO NOT CALL THIS FUNCTION MANUALLY. USE backend.FetchMatches INSTEAD.\nRun pulls Tickets that satisfy Profile constraints from QueryService,\nruns matchmaking logic against them, then constructs and streams back\nmatch candidates to the Backend service.",
-        "operationId": "MatchFunction_Run",
+        "summary": "DO NOT CALL THIS FUNCTION MANUALLY. USE backend.FetchMatches INSTEAD.\nRun pulls Tickets that satisify Profile constraints from QueryService, runs matchmaking logics against them, then\nconstructs and streams back match candidates to the Backend service.",
+        "operationId": "Run",
        "responses": {
          "200": {
            "description": "A successful response.(streaming responses)",
            "schema": {
-              "type": "object",
-              "properties": {
-                "result": {
-                  "$ref": "#/definitions/openmatchRunResponse"
-                },
-                "error": {
-                  "$ref": "#/definitions/rpcStatus"
-                }
-              },
-              "title": "Stream result of openmatchRunResponse"
+              "$ref": "#/x-stream-definitions/openmatchRunResponse"
            }
          },
          "404": {
@ -55,12 +41,6 @@
              "type": "string",
              "format": "string"
            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
-            }
          }
        },
        "parameters": [
@ -80,17 +60,6 @@
    }
  },
  "definitions": {
-    "DoubleRangeFilterExclude": {
-      "type": "string",
-      "enum": [
-        "NONE",
-        "MIN",
-        "MAX",
-        "BOTH"
-      ],
-      "default": "NONE",
-      "title": "- NONE: No bounds should be excluded when evaluating the filter, i.e.: MIN \u003c= x \u003c= MAX\n - MIN: Only the minimum bound should be excluded when evaluating the filter, i.e.: MIN \u003c x \u003c= MAX\n - MAX: Only the maximum bound should be excluded when evaluating the filter, i.e.: MIN \u003c= x \u003c MAX\n - BOTH: Both bounds should be excluded when evaluating the filter, i.e.: MIN \u003c x \u003c MAX"
-    },
    "openmatchAssignment": {
      "type": "object",
      "properties": {
@ -106,38 +75,7 @@
          "description": "Customized information not inspected by Open Match, to be used by the match\nmaking function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
        }
      },
-      "description": "An Assignment represents a game server assignment associated with a Ticket.\nOpen Match does not require or inspect any fields on assignment."
-    },
-    "openmatchBackfill": {
-      "type": "object",
-      "properties": {
-        "id": {
-          "type": "string",
-          "description": "Id represents an auto-generated Id issued by Open Match."
-        },
-        "search_fields": {
-          "$ref": "#/definitions/openmatchSearchFields",
-          "description": "Search fields are the fields which Open Match is aware of, and can be used\nwhen specifying filters."
-        },
-        "extensions": {
-          "type": "object",
-          "additionalProperties": {
-            "$ref": "#/definitions/protobufAny"
-          },
-          "description": "Customized information not inspected by Open Match, to be used by\nthe Match Function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
-        },
-        "create_time": {
-          "type": "string",
-          "format": "date-time",
-          "description": "Create time is the time the Ticket was created. It is populated by Open\nMatch at the time of Ticket creation."
-        },
-        "generation": {
-          "type": "string",
-          "format": "int64",
-          "description": "Generation gets incremented on GameServers update operations.\nPrevents the MMF from overriding a newer version from the game server.\nDo NOT read or write to this field, it is for internal tracking, and changing the value will cause bugs."
-        }
-      },
-      "description": "Represents a backfill entity which is used to fill partially full matches.\n\nBETA FEATURE WARNING:  This call and the associated Request and Response\nmessages are not finalized and still subject to possible change or removal."
+      "description": "An Assignment represents a game server assignment associated with a Ticket. Open\nmatch does not require or inspect any fields on assignment."
    },
    "openmatchDoubleRangeFilter": {
      "type": "object",
@ -155,10 +93,6 @@
          "type": "number",
          "format": "double",
          "description": "Minimum value."
-        },
-        "exclude": {
-          "$ref": "#/definitions/DoubleRangeFilterExclude",
-          "description": "Defines the bounds to apply when filtering tickets by their search_fields.double_args value.\nBETA FEATURE WARNING: This field and the associated values are\nnot finalized and still subject to possible change or removal."
        }
      },
      "title": "Filters numerical values to only those within a range.\n  double_arg: \"foo\"\n  max: 10\n  min: 5\nmatches:\n  {\"foo\": 5}\n  {\"foo\": 7.5}\n  {\"foo\": 10}\ndoes not match:\n  {\"foo\": 4}\n  {\"foo\": 10.01}\n  {\"foo\": \"7.5\"}\n  {}"
@ -191,14 +125,6 @@
            "$ref": "#/definitions/protobufAny"
          },
          "description": "Customized information not inspected by Open Match, to be used by the match\nmaking function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
-        },
-        "backfill": {
-          "$ref": "#/definitions/openmatchBackfill",
-          "description": "Backfill request which contains additional information to the match\nand contains an association to a GameServer.\nBETA FEATURE WARNING: This field is not finalized and still subject\nto possible change or removal."
-        },
-        "allocate_gameserver": {
-          "type": "boolean",
-          "description": "AllocateGameServer signalise Director that Backfill is new and it should \nallocate a GameServer, this Backfill would be assigned.\nBETA FEATURE WARNING: This field is not finalized and still subject\nto possible change or removal."
        }
      },
      "description": "A Match is used to represent a completed match object. It can be generated by\na MatchFunction as a proposal or can be returned by OpenMatch as a result in\nresponse to the FetchMatches call.\nWhen a match is returned by the FetchMatches call, it should contain at least\none ticket to be considered as valid."
@ -239,7 +165,7 @@
          "items": {
            "$ref": "#/definitions/openmatchDoubleRangeFilter"
          },
-          "description": "Set of Filters indicating the filtering criteria. Selected tickets must\nmatch every Filter."
+          "description": "Set of Filters indicating the filtering criteria. Selected players must\nmatch every Filter."
        },
        "string_equals_filters": {
          "type": "array",
@ -252,19 +178,8 @@
          "items": {
            "$ref": "#/definitions/openmatchTagPresentFilter"
          }
-        },
-        "created_before": {
-          "type": "string",
-          "format": "date-time",
-          "description": "If specified, only Tickets created before the specified time are selected."
-        },
-        "created_after": {
-          "type": "string",
-          "format": "date-time",
-          "description": "If specified, only Tickets created after the specified time are selected."
        }
-      },
-      "description": "Pool specfies a set of criteria that are used to select a subset of Tickets\nthat meet all the criteria."
+      }
    },
    "openmatchRunRequest": {
      "type": "object",
@ -343,7 +258,7 @@
        },
        "assignment": {
          "$ref": "#/definitions/openmatchAssignment",
-          "description": "An Assignment represents a game server assignment associated with a Ticket,\nor whatever finalized matched state means for your use case.\nOpen Match does not require or inspect any fields on Assignment."
+          "description": "An Assignment represents a game server assignment associated with a Ticket.\nOpen Match does not require or inspect any fields on Assignment."
        },
        "search_fields": {
          "$ref": "#/definitions/openmatchSearchFields",
@ -355,14 +270,9 @@
            "$ref": "#/definitions/protobufAny"
          },
          "description": "Customized information not inspected by Open Match, to be used by the match\nmaking function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
-        },
-        "create_time": {
-          "type": "string",
-          "format": "date-time",
-          "description": "Create time is the time the Ticket was created. It is populated by Open\nMatch at the time of Ticket creation."
        }
      },
-      "description": "A Ticket is a basic matchmaking entity in Open Match. A Ticket may represent\nan individual 'Player', a 'Group' of players, or any other concepts unique to\nyour use case. Open Match will not interpret what the Ticket represents but\njust treat it as a matchmaking unit with a set of SearchFields. Open Match\nstores the Ticket in state storage and enables an Assignment to be set on the\nTicket."
+      "description": "A Ticket is a basic matchmaking entity in Open Match. A Ticket represents either an\nindividual 'Player' or a 'Group' of players. Open Match will not interpret\nwhat the Ticket represents but just treat it as a matchmaking unit with a set\nof SearchFields. Open Match stores the Ticket in state storage and enables an\nAssignment to be associated with this Ticket."
    },
    "protobufAny": {
      "type": "object",
@ -379,27 +289,44 @@
      },
      "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n    Foo foo = ...;\n    Any any;\n    any.PackFrom(foo);\n    ...\n    if (any.UnpackTo(\u0026foo)) {\n      ...\n    }\n\nExample 2: Pack and unpack a message in Java.\n\n    Foo foo = ...;\n    Any any = Any.pack(foo);\n    ...\n    if (any.is(Foo.class)) {\n      foo = any.unpack(Foo.class);\n    }\n\n Example 3: Pack and unpack a message in Python.\n\n    foo = Foo(...)\n    any = Any()\n    any.Pack(foo)\n    ...\n    if any.Is(Foo.DESCRIPTOR):\n      any.Unpack(foo)\n      ...\n\n Example 4: Pack and unpack a message in Go\n\n     foo := \u0026pb.Foo{...}\n     any, err := ptypes.MarshalAny(foo)\n     ...\n     foo := \u0026pb.Foo{}\n     if err := ptypes.UnmarshalAny(any, foo); err != nil {\n       ...\n     }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n    package google.profile;\n    message Person {\n      string first_name = 1;\n      string last_name = 2;\n    }\n\n    {\n      \"@type\": \"type.googleapis.com/google.profile.Person\",\n      \"firstName\": \u003cstring\u003e,\n      \"lastName\": \u003cstring\u003e\n    }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n    {\n      \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n      \"value\": \"1.212s\"\n    }"
    },
-    "rpcStatus": {
+    "runtimeStreamError": {
      "type": "object",
      "properties": {
-        "code": {
+        "grpc_code": {
          "type": "integer",
-          "format": "int32",
-          "description": "The status code, which should be an enum value of [google.rpc.Code][google.rpc.Code]."
+          "format": "int32"
+        },
+        "http_code": {
+          "type": "integer",
+          "format": "int32"
        },
        "message": {
-          "type": "string",
-          "description": "A developer-facing error message, which should be in English. Any\nuser-facing error message should be localized and sent in the\n[google.rpc.Status.details][google.rpc.Status.details] field, or localized by the client."
+          "type": "string"
+        },
+        "http_status": {
+          "type": "string"
        },
        "details": {
          "type": "array",
          "items": {
            "$ref": "#/definitions/protobufAny"
-          },
-          "description": "A list of messages that carry the error details.  There is a common set of\nmessage types for APIs to use."
+          }
+        }
+      }
+    }
+  },
+  "x-stream-definitions": {
+    "openmatchRunResponse": {
+      "type": "object",
+      "properties": {
+        "result": {
+          "$ref": "#/definitions/openmatchRunResponse"
+        },
+        "error": {
+          "$ref": "#/definitions/runtimeStreamError"
        }
      },
-      "description": "The `Status` type defines a logical error model that is suitable for\ndifferent programming environments, including REST APIs and RPC APIs. It is\nused by [gRPC](https://github.com/grpc). Each `Status` message contains\nthree pieces of data: error code, error message, and error details.\n\nYou can find out more about this error model and how to work with it in the\n[API Design Guide](https://cloud.google.com/apis/design/errors)."
+      "title": "Stream result of openmatchRunResponse"
    }
  },
  "externalDocs": {
--- a/api/messages.proto
+++ b/api/messages.proto
@ -19,20 +19,17 @@ option csharp_namespace = "OpenMatch";

 import "google/rpc/status.proto";
 import "google/protobuf/any.proto";
-import "google/protobuf/timestamp.proto";

-// A Ticket is a basic matchmaking entity in Open Match. A Ticket may represent
-// an individual 'Player', a 'Group' of players, or any other concepts unique to
-// your use case. Open Match will not interpret what the Ticket represents but
-// just treat it as a matchmaking unit with a set of SearchFields. Open Match
-// stores the Ticket in state storage and enables an Assignment to be set on the
-// Ticket.
+// A Ticket is a basic matchmaking entity in Open Match. A Ticket represents either an
+// individual 'Player' or a 'Group' of players. Open Match will not interpret
+// what the Ticket represents but just treat it as a matchmaking unit with a set
+// of SearchFields. Open Match stores the Ticket in state storage and enables an
+// Assignment to be associated with this Ticket.
 message Ticket {
  // Id represents an auto-generated Id issued by Open Match.
  string id = 1;

-  // An Assignment represents a game server assignment associated with a Ticket,
-  // or whatever finalized matched state means for your use case.
+  // An Assignment represents a game server assignment associated with a Ticket.
  // Open Match does not require or inspect any fields on Assignment.
  Assignment assignment = 3;

@ -45,10 +42,6 @@ message Ticket {
  // Optional, depending on the requirements of the connected systems.
  map<string, google.protobuf.Any> extensions = 5;

-  // Create time is the time the Ticket was created. It is populated by Open
-  // Match at the time of Ticket creation.
-  google.protobuf.Timestamp create_time = 6;
-
  // Deprecated fields.
  reserved 2;
 }
@ -66,8 +59,8 @@ message SearchFields {
  repeated string tags = 3;
 }

-// An Assignment represents a game server assignment associated with a Ticket.
-// Open Match does not require or inspect any fields on assignment.
+// An Assignment represents a game server assignment associated with a Ticket. Open
+// match does not require or inspect any fields on assignment.
 message Assignment {
  // Connection information for this Assignment.
  string connection = 1;
@ -103,25 +96,6 @@ message DoubleRangeFilter {

  // Minimum value.
  double min = 3;
-
-  enum Exclude {
-    // No bounds should be excluded when evaluating the filter, i.e.: MIN <= x <= MAX
-    NONE = 0;
-
-    // Only the minimum bound should be excluded when evaluating the filter, i.e.: MIN < x <= MAX
-    MIN = 1;
-
-    // Only the maximum bound should be excluded when evaluating the filter, i.e.: MIN <= x < MAX
-    MAX = 2;
-
-    // Both bounds should be excluded when evaluating the filter, i.e.: MIN < x < MAX
-    BOTH = 3;
-  }
-
-  // Defines the bounds to apply when filtering tickets by their search_fields.double_args value.
-  // BETA FEATURE WARNING: This field and the associated values are
-  // not finalized and still subject to possible change or removal.
-  Exclude exclude = 4;
 }

 // Filters strings exactly equaling a value.
@ -152,13 +126,11 @@ message TagPresentFilter {
  string tag = 1;
 }

-// Pool specfies a set of criteria that are used to select a subset of Tickets
-// that meet all the criteria.
 message Pool {
  // A developer-chosen human-readable name for this Pool.
  string name = 1;

-  // Set of Filters indicating the filtering criteria. Selected tickets must
+  // Set of Filters indicating the filtering criteria. Selected players must
  // match every Filter.
  repeated DoubleRangeFilter double_range_filters = 2;

@ -166,12 +138,6 @@ message Pool {

  repeated TagPresentFilter tag_present_filters = 5;

-  // If specified, only Tickets created before the specified time are selected.
-  google.protobuf.Timestamp created_before = 6;
-
-  // If specified, only Tickets created after the specified time are selected.
-  google.protobuf.Timestamp created_after = 7;
-
  // Deprecated fields.
  reserved 3;
 }
@ -220,45 +186,6 @@ message Match {
  // Optional, depending on the requirements of the connected systems.
  map<string, google.protobuf.Any> extensions = 7;

-  // Backfill request which contains additional information to the match
-  // and contains an association to a GameServer.
-  // BETA FEATURE WARNING: This field is not finalized and still subject
-  // to possible change or removal.
-  Backfill backfill = 8;
-
-  // AllocateGameServer signalise Director that Backfill is new and it should 
-  // allocate a GameServer, this Backfill would be assigned.
-  // BETA FEATURE WARNING: This field is not finalized and still subject
-  // to possible change or removal.
-  bool allocate_gameserver = 9;
-
  // Deprecated fields.
  reserved 5, 6;
 }
-
-// Represents a backfill entity which is used to fill partially full matches.
-// 
-// BETA FEATURE WARNING:  This call and the associated Request and Response
-// messages are not finalized and still subject to possible change or removal.
-message Backfill {
-  // Id represents an auto-generated Id issued by Open Match.
-  string id = 1;
-
-  // Search fields are the fields which Open Match is aware of, and can be used
-  // when specifying filters.
-  SearchFields search_fields = 2;
-
-  // Customized information not inspected by Open Match, to be used by
-  // the Match Function, evaluator, and components making calls to Open Match.
-  // Optional, depending on the requirements of the connected systems.
-  map<string, google.protobuf.Any> extensions = 3;
-
-  // Create time is the time the Ticket was created. It is populated by Open
-  // Match at the time of Ticket creation.
-  google.protobuf.Timestamp create_time = 4;
-
-  // Generation gets incremented on GameServers update operations.
-  // Prevents the MMF from overriding a newer version from the game server.
-  // Do NOT read or write to this field, it is for internal tracking, and changing the value will cause bugs.
-  int64 generation = 5;
-}
--- a/api/query.proto
+++ b/api/query.proto
@ -19,9 +19,9 @@ option csharp_namespace = "OpenMatch";

 import "api/messages.proto";
 import "google/api/annotations.proto";
-import "protoc-gen-openapiv2/options/annotations.proto";
+import "protoc-gen-swagger/options/annotations.proto";

-option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
+option (grpc.gateway.protoc_gen_swagger.options.openapiv2_swagger) = {
  info: {
    title: "MM Logic (Data Layer)"
    version: "1.0"
@ -52,74 +52,29 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
  }
  // TODO Add annotations for security_defintiions.
  // See
-  // https://github.com/grpc-ecosystem/grpc-gateway/blob/master/examples/internal/proto/examplepb/a_bit_of_everything.proto
+  // https://github.com/grpc-ecosystem/grpc-gateway/blob/master/examples/proto/examplepb/a_bit_of_everything.proto
 };

 message QueryTicketsRequest {
-  // The Pool representing the set of Filters to be queried.
+  // A Pool is consists of a set of Filters.
  Pool pool = 1;
 }

 message QueryTicketsResponse {
-  // Tickets that meet all the filtering criteria requested by the pool.
+  // Tickets that satisfy all the filtering criteria.
  repeated Ticket tickets = 1;
 }

-message QueryTicketIdsRequest {
-  // The Pool representing the set of Filters to be queried.
-  Pool pool = 1;
-}
-
-message QueryTicketIdsResponse {
-  // TicketIDs that meet all the filtering criteria requested by the pool.
-  repeated string ids = 1;
-}
-
-// BETA FEATURE WARNING:  This Request messages are not finalized and 
-// still subject to possible change or removal.
-message QueryBackfillsRequest {
-  // The Pool representing the set of Filters to be queried.
-  Pool pool = 1;
-}
-
-// BETA FEATURE WARNING:  This Request messages are not finalized and 
-// still subject to possible change or removal.
-message QueryBackfillsResponse {
-  // Backfills that meet all the filtering criteria requested by the pool.
-  repeated Backfill backfills = 1;
-}
-
 // The QueryService service implements helper APIs for Match Function to query Tickets from state storage.
 service QueryService {
  // QueryTickets gets a list of Tickets that match all Filters of the input Pool.
  //   - If the Pool contains no Filters, QueryTickets will return all Tickets in the state storage.
-  // QueryTickets pages the Tickets by `queryPageSize` and stream back responses.
-  //   - queryPageSize is default to 1000 if not set, and has a minimum of 10 and maximum of 10000.
+  // QueryTickets pages the Tickets by `storage.pool.size` and stream back response.
+  //   - storage.pool.size is default to 1000 if not set, and has a mininum of 10 and maximum of 10000
  rpc QueryTickets(QueryTicketsRequest) returns (stream QueryTicketsResponse) {
    option (google.api.http) = {
      post: "/v1/queryservice/tickets:query"
      body: "*"
    };
  }
-
-  // QueryTicketIds gets the list of TicketIDs that meet all the filtering criteria requested by the pool.
-  //   - If the Pool contains no Filters, QueryTicketIds will return all TicketIDs in the state storage.
-  // QueryTicketIds pages the TicketIDs by `queryPageSize` and stream back responses.
-  //   - queryPageSize is default to 1000 if not set, and has a minimum of 10 and maximum of 10000.
-  rpc QueryTicketIds(QueryTicketIdsRequest) returns (stream QueryTicketIdsResponse) {
-    option (google.api.http) = {
-      post: "/v1/queryservice/ticketids:query"
-      body: "*"
-    };
-  }
-
-  // QueryBackfills gets a list of Backfills.
-  // BETA FEATURE WARNING:  This call and the associated Request and Response
-  // messages are not finalized and still subject to possible change or removal.
-  rpc QueryBackfills(QueryBackfillsRequest) returns (stream QueryBackfillsResponse) {
-    option (google.api.http) = {
-      post: "/v1/queryservice/backfills:query"
-      body: "*"
-    };
-  }
 }
--- a/api/query.swagger.json
+++ b/api/query.swagger.json
@ -13,11 +13,6 @@
      "url": "https://github.com/googleforgames/open-match/blob/master/LICENSE"
    }
  },
-  "tags": [
-    {
-      "name": "QueryService"
-    }
-  ],
  "schemes": [
    "http",
    "https"
@ -29,122 +24,15 @@
    "application/json"
  ],
  "paths": {
-    "/v1/queryservice/backfills:query": {
-      "post": {
-        "summary": "QueryBackfills gets a list of Backfills.\nBETA FEATURE WARNING:  This call and the associated Request and Response\nmessages are not finalized and still subject to possible change or removal.",
-        "operationId": "QueryService_QueryBackfills",
-        "responses": {
-          "200": {
-            "description": "A successful response.(streaming responses)",
-            "schema": {
-              "type": "object",
-              "properties": {
-                "result": {
-                  "$ref": "#/definitions/openmatchQueryBackfillsResponse"
-                },
-                "error": {
-                  "$ref": "#/definitions/rpcStatus"
-                }
-              },
-              "title": "Stream result of openmatchQueryBackfillsResponse"
-            }
-          },
-          "404": {
-            "description": "Returned when the resource does not exist.",
-            "schema": {
-              "type": "string",
-              "format": "string"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
-            }
-          }
-        },
-        "parameters": [
-          {
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/openmatchQueryBackfillsRequest"
-            }
-          }
-        ],
-        "tags": [
-          "QueryService"
-        ]
-      }
-    },
-    "/v1/queryservice/ticketids:query": {
-      "post": {
-        "summary": "QueryTicketIds gets the list of TicketIDs that meet all the filtering criteria requested by the pool.\n  - If the Pool contains no Filters, QueryTicketIds will return all TicketIDs in the state storage.\nQueryTicketIds pages the TicketIDs by `queryPageSize` and stream back responses.\n  - queryPageSize is default to 1000 if not set, and has a minimum of 10 and maximum of 10000.",
-        "operationId": "QueryService_QueryTicketIds",
-        "responses": {
-          "200": {
-            "description": "A successful response.(streaming responses)",
-            "schema": {
-              "type": "object",
-              "properties": {
-                "result": {
-                  "$ref": "#/definitions/openmatchQueryTicketIdsResponse"
-                },
-                "error": {
-                  "$ref": "#/definitions/rpcStatus"
-                }
-              },
-              "title": "Stream result of openmatchQueryTicketIdsResponse"
-            }
-          },
-          "404": {
-            "description": "Returned when the resource does not exist.",
-            "schema": {
-              "type": "string",
-              "format": "string"
-            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
-            }
-          }
-        },
-        "parameters": [
-          {
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "$ref": "#/definitions/openmatchQueryTicketIdsRequest"
-            }
-          }
-        ],
-        "tags": [
-          "QueryService"
-        ]
-      }
-    },
    "/v1/queryservice/tickets:query": {
      "post": {
-        "summary": "QueryTickets gets a list of Tickets that match all Filters of the input Pool.\n  - If the Pool contains no Filters, QueryTickets will return all Tickets in the state storage.\nQueryTickets pages the Tickets by `queryPageSize` and stream back responses.\n  - queryPageSize is default to 1000 if not set, and has a minimum of 10 and maximum of 10000.",
-        "operationId": "QueryService_QueryTickets",
+        "summary": "QueryTickets gets a list of Tickets that match all Filters of the input Pool.\n  - If the Pool contains no Filters, QueryTickets will return all Tickets in the state storage.\nQueryTickets pages the Tickets by `storage.pool.size` and stream back response.\n  - storage.pool.size is default to 1000 if not set, and has a mininum of 10 and maximum of 10000",
+        "operationId": "QueryTickets",
        "responses": {
          "200": {
            "description": "A successful response.(streaming responses)",
            "schema": {
-              "type": "object",
-              "properties": {
-                "result": {
-                  "$ref": "#/definitions/openmatchQueryTicketsResponse"
-                },
-                "error": {
-                  "$ref": "#/definitions/rpcStatus"
-                }
-              },
-              "title": "Stream result of openmatchQueryTicketsResponse"
+              "$ref": "#/x-stream-definitions/openmatchQueryTicketsResponse"
            }
          },
          "404": {
@ -153,12 +41,6 @@
              "type": "string",
              "format": "string"
            }
-          },
-          "default": {
-            "description": "An unexpected error response.",
-            "schema": {
-              "$ref": "#/definitions/rpcStatus"
-            }
          }
        },
        "parameters": [
@ -178,17 +60,6 @@
    }
  },
  "definitions": {
-    "DoubleRangeFilterExclude": {
-      "type": "string",
-      "enum": [
-        "NONE",
-        "MIN",
-        "MAX",
-        "BOTH"
-      ],
-      "default": "NONE",
-      "title": "- NONE: No bounds should be excluded when evaluating the filter, i.e.: MIN \u003c= x \u003c= MAX\n - MIN: Only the minimum bound should be excluded when evaluating the filter, i.e.: MIN \u003c x \u003c= MAX\n - MAX: Only the maximum bound should be excluded when evaluating the filter, i.e.: MIN \u003c= x \u003c MAX\n - BOTH: Both bounds should be excluded when evaluating the filter, i.e.: MIN \u003c x \u003c MAX"
-    },
    "openmatchAssignment": {
      "type": "object",
      "properties": {
@ -204,38 +75,7 @@
          "description": "Customized information not inspected by Open Match, to be used by the match\nmaking function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
        }
      },
-      "description": "An Assignment represents a game server assignment associated with a Ticket.\nOpen Match does not require or inspect any fields on assignment."
-    },
-    "openmatchBackfill": {
-      "type": "object",
-      "properties": {
-        "id": {
-          "type": "string",
-          "description": "Id represents an auto-generated Id issued by Open Match."
-        },
-        "search_fields": {
-          "$ref": "#/definitions/openmatchSearchFields",
-          "description": "Search fields are the fields which Open Match is aware of, and can be used\nwhen specifying filters."
-        },
-        "extensions": {
-          "type": "object",
-          "additionalProperties": {
-            "$ref": "#/definitions/protobufAny"
-          },
-          "description": "Customized information not inspected by Open Match, to be used by\nthe Match Function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
-        },
-        "create_time": {
-          "type": "string",
-          "format": "date-time",
-          "description": "Create time is the time the Ticket was created. It is populated by Open\nMatch at the time of Ticket creation."
-        },
-        "generation": {
-          "type": "string",
-          "format": "int64",
-          "description": "Generation gets incremented on GameServers update operations.\nPrevents the MMF from overriding a newer version from the game server.\nDo NOT read or write to this field, it is for internal tracking, and changing the value will cause bugs."
-        }
-      },
-      "description": "Represents a backfill entity which is used to fill partially full matches.\n\nBETA FEATURE WARNING:  This call and the associated Request and Response\nmessages are not finalized and still subject to possible change or removal."
+      "description": "An Assignment represents a game server assignment associated with a Ticket. Open\nmatch does not require or inspect any fields on assignment."
    },
    "openmatchDoubleRangeFilter": {
      "type": "object",
@ -253,10 +93,6 @@
          "type": "number",
          "format": "double",
          "description": "Minimum value."
-        },
-        "exclude": {
-          "$ref": "#/definitions/DoubleRangeFilterExclude",
-          "description": "Defines the bounds to apply when filtering tickets by their search_fields.double_args value.\nBETA FEATURE WARNING: This field and the associated values are\nnot finalized and still subject to possible change or removal."
        }
      },
      "title": "Filters numerical values to only those within a range.\n  double_arg: \"foo\"\n  max: 10\n  min: 5\nmatches:\n  {\"foo\": 5}\n  {\"foo\": 7.5}\n  {\"foo\": 10}\ndoes not match:\n  {\"foo\": 4}\n  {\"foo\": 10.01}\n  {\"foo\": \"7.5\"}\n  {}"
@ -273,7 +109,7 @@
          "items": {
            "$ref": "#/definitions/openmatchDoubleRangeFilter"
          },
-          "description": "Set of Filters indicating the filtering criteria. Selected tickets must\nmatch every Filter."
+          "description": "Set of Filters indicating the filtering criteria. Selected players must\nmatch every Filter."
        },
        "string_equals_filters": {
          "type": "array",
@ -286,61 +122,6 @@
          "items": {
            "$ref": "#/definitions/openmatchTagPresentFilter"
          }
-        },
-        "created_before": {
-          "type": "string",
-          "format": "date-time",
-          "description": "If specified, only Tickets created before the specified time are selected."
-        },
-        "created_after": {
-          "type": "string",
-          "format": "date-time",
-          "description": "If specified, only Tickets created after the specified time are selected."
-        }
-      },
-      "description": "Pool specfies a set of criteria that are used to select a subset of Tickets\nthat meet all the criteria."
-    },
-    "openmatchQueryBackfillsRequest": {
-      "type": "object",
-      "properties": {
-        "pool": {
-          "$ref": "#/definitions/openmatchPool",
-          "description": "The Pool representing the set of Filters to be queried."
-        }
-      },
-      "description": "BETA FEATURE WARNING:  This Request messages are not finalized and \nstill subject to possible change or removal."
-    },
-    "openmatchQueryBackfillsResponse": {
-      "type": "object",
-      "properties": {
-        "backfills": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/openmatchBackfill"
-          },
-          "description": "Backfills that meet all the filtering criteria requested by the pool."
-        }
-      },
-      "description": "BETA FEATURE WARNING:  This Request messages are not finalized and \nstill subject to possible change or removal."
-    },
-    "openmatchQueryTicketIdsRequest": {
-      "type": "object",
-      "properties": {
-        "pool": {
-          "$ref": "#/definitions/openmatchPool",
-          "description": "The Pool representing the set of Filters to be queried."
-        }
-      }
-    },
-    "openmatchQueryTicketIdsResponse": {
-      "type": "object",
-      "properties": {
-        "ids": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          },
-          "description": "TicketIDs that meet all the filtering criteria requested by the pool."
        }
      }
    },
@ -349,7 +130,7 @@
      "properties": {
        "pool": {
          "$ref": "#/definitions/openmatchPool",
-          "description": "The Pool representing the set of Filters to be queried."
+          "description": "A Pool is consists of a set of Filters."
        }
      }
    },
@ -361,7 +142,7 @@
          "items": {
            "$ref": "#/definitions/openmatchTicket"
          },
-          "description": "Tickets that meet all the filtering criteria requested by the pool."
+          "description": "Tickets that satisfy all the filtering criteria."
        }
      }
    },
@ -424,7 +205,7 @@
        },
        "assignment": {
          "$ref": "#/definitions/openmatchAssignment",
-          "description": "An Assignment represents a game server assignment associated with a Ticket,\nor whatever finalized matched state means for your use case.\nOpen Match does not require or inspect any fields on Assignment."
+          "description": "An Assignment represents a game server assignment associated with a Ticket.\nOpen Match does not require or inspect any fields on Assignment."
        },
        "search_fields": {
          "$ref": "#/definitions/openmatchSearchFields",
@ -436,14 +217,9 @@
            "$ref": "#/definitions/protobufAny"
          },
          "description": "Customized information not inspected by Open Match, to be used by the match\nmaking function, evaluator, and components making calls to Open Match.\nOptional, depending on the requirements of the connected systems."
-        },
-        "create_time": {
-          "type": "string",
-          "format": "date-time",
-          "description": "Create time is the time the Ticket was created. It is populated by Open\nMatch at the time of Ticket creation."
        }
      },
-      "description": "A Ticket is a basic matchmaking entity in Open Match. A Ticket may represent\nan individual 'Player', a 'Group' of players, or any other concepts unique to\nyour use case. Open Match will not interpret what the Ticket represents but\njust treat it as a matchmaking unit with a set of SearchFields. Open Match\nstores the Ticket in state storage and enables an Assignment to be set on the\nTicket."
+      "description": "A Ticket is a basic matchmaking entity in Open Match. A Ticket represents either an\nindividual 'Player' or a 'Group' of players. Open Match will not interpret\nwhat the Ticket represents but just treat it as a matchmaking unit with a set\nof SearchFields. Open Match stores the Ticket in state storage and enables an\nAssignment to be associated with this Ticket."
    },
    "protobufAny": {
      "type": "object",
@ -460,27 +236,44 @@
      },
      "description": "`Any` contains an arbitrary serialized protocol buffer message along with a\nURL that describes the type of the serialized message.\n\nProtobuf library provides support to pack/unpack Any values in the form\nof utility functions or additional generated methods of the Any type.\n\nExample 1: Pack and unpack a message in C++.\n\n    Foo foo = ...;\n    Any any;\n    any.PackFrom(foo);\n    ...\n    if (any.UnpackTo(\u0026foo)) {\n      ...\n    }\n\nExample 2: Pack and unpack a message in Java.\n\n    Foo foo = ...;\n    Any any = Any.pack(foo);\n    ...\n    if (any.is(Foo.class)) {\n      foo = any.unpack(Foo.class);\n    }\n\n Example 3: Pack and unpack a message in Python.\n\n    foo = Foo(...)\n    any = Any()\n    any.Pack(foo)\n    ...\n    if any.Is(Foo.DESCRIPTOR):\n      any.Unpack(foo)\n      ...\n\n Example 4: Pack and unpack a message in Go\n\n     foo := \u0026pb.Foo{...}\n     any, err := ptypes.MarshalAny(foo)\n     ...\n     foo := \u0026pb.Foo{}\n     if err := ptypes.UnmarshalAny(any, foo); err != nil {\n       ...\n     }\n\nThe pack methods provided by protobuf library will by default use\n'type.googleapis.com/full.type.name' as the type URL and the unpack\nmethods only use the fully qualified type name after the last '/'\nin the type URL, for example \"foo.bar.com/x/y.z\" will yield type\nname \"y.z\".\n\n\nJSON\n====\nThe JSON representation of an `Any` value uses the regular\nrepresentation of the deserialized, embedded message, with an\nadditional field `@type` which contains the type URL. Example:\n\n    package google.profile;\n    message Person {\n      string first_name = 1;\n      string last_name = 2;\n    }\n\n    {\n      \"@type\": \"type.googleapis.com/google.profile.Person\",\n      \"firstName\": \u003cstring\u003e,\n      \"lastName\": \u003cstring\u003e\n    }\n\nIf the embedded message type is well-known and has a custom JSON\nrepresentation, that representation will be embedded adding a field\n`value` which holds the custom JSON in addition to the `@type`\nfield. Example (for message [google.protobuf.Duration][]):\n\n    {\n      \"@type\": \"type.googleapis.com/google.protobuf.Duration\",\n      \"value\": \"1.212s\"\n    }"
    },
-    "rpcStatus": {
+    "runtimeStreamError": {
      "type": "object",
      "properties": {
-        "code": {
+        "grpc_code": {
          "type": "integer",
-          "format": "int32",
-          "description": "The status code, which should be an enum value of [google.rpc.Code][google.rpc.Code]."
+          "format": "int32"
+        },
+        "http_code": {
+          "type": "integer",
+          "format": "int32"
        },
        "message": {
-          "type": "string",
-          "description": "A developer-facing error message, which should be in English. Any\nuser-facing error message should be localized and sent in the\n[google.rpc.Status.details][google.rpc.Status.details] field, or localized by the client."
+          "type": "string"
+        },
+        "http_status": {
+          "type": "string"
        },
        "details": {
          "type": "array",
          "items": {
            "$ref": "#/definitions/protobufAny"
-          },
-          "description": "A list of messages that carry the error details.  There is a common set of\nmessage types for APIs to use."
+          }
+        }
+      }
+    }
+  },
+  "x-stream-definitions": {
+    "openmatchQueryTicketsResponse": {
+      "type": "object",
+      "properties": {
+        "result": {
+          "$ref": "#/definitions/openmatchQueryTicketsResponse"
+        },
+        "error": {
+          "$ref": "#/definitions/runtimeStreamError"
        }
      },
-      "description": "The `Status` type defines a logical error model that is suitable for\ndifferent programming environments, including REST APIs and RPC APIs. It is\nused by [gRPC](https://github.com/grpc). Each `Status` message contains\nthree pieces of data: error code, error message, and error details.\n\nYou can find out more about this error model and how to work with it in the\n[API Design Guide](https://cloud.google.com/apis/design/errors)."
+      "title": "Stream result of openmatchQueryTicketsResponse"
    }
  },
  "externalDocs": {
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@ -90,7 +90,7 @@ steps:

 - id: 'Build: Assets'
  name: 'gcr.io/$PROJECT_ID/open-match-build'
-  args: ['make', '_CHARTS_BUCKET=${_CHARTS_BUCKET}', 'assets', '-j12']
+  args: ['make', 'assets', '-j12']
  volumes:
  - name: 'go-vol'
    path: '/go'
@ -132,7 +132,7 @@ steps:

 - id: 'Deploy: Deployment Configs'
  name: 'gcr.io/$PROJECT_ID/open-match-build'
-  args: ['make', '_GCB_POST_SUBMIT=${_GCB_POST_SUBMIT}', '_GCB_LATEST_VERSION=${_GCB_LATEST_VERSION}', 'SHORT_SHA=${SHORT_SHA}', 'BRANCH_NAME=${BRANCH_NAME}', '_CHARTS_BUCKET=${_CHARTS_BUCKET}',  'ci-deploy-artifacts']
+  args: ['make', '_GCB_POST_SUBMIT=${_GCB_POST_SUBMIT}', '_GCB_LATEST_VERSION=${_GCB_LATEST_VERSION}', 'SHORT_SHA=${SHORT_SHA}', 'BRANCH_NAME=${BRANCH_NAME}', 'ci-deploy-artifacts']
  waitFor: ['Lint: Format, Vet, Charts', 'Test: Deploy Open Match']
  volumes:
  - name: 'go-vol'
@ -153,7 +153,7 @@ steps:

 artifacts:
    objects:
-        location: '${_ARTIFACTS_BUCKET}'
+        location: gs://open-match-build-artifacts/output/
        paths:
            - install/yaml/install.yaml
            - install/yaml/01-open-match-core.yaml
@ -164,13 +164,10 @@ artifacts:
            - install/yaml/06-open-match-override-configmap.yaml
            
 substitutions:
-    _OM_VERSION: "1.3.0-rc.1"
+    _OM_VERSION: "0.9.0"
    _GCB_POST_SUBMIT: "0"
    _GCB_LATEST_VERSION: "undefined"
-    _ARTIFACTS_BUCKET: "gs://open-match-build-artifacts/output/"
-    _LOGS_BUCKET: "gs://open-match-build-logs/"
-    _CHARTS_BUCKET: "gs://open-match-chart"
-logsBucket: '${_LOGS_BUCKET}'
+logsBucket: 'gs://open-match-build-logs/'
 options:
  sourceProvenanceHash: ['SHA256']
  machineType: 'N1_HIGHCPU_32'
--- a/cmd/backend/backend.go
+++ b/cmd/backend/backend.go
@ -16,10 +16,11 @@
 package main

 import (
+	"open-match.dev/open-match/internal/app"
 	"open-match.dev/open-match/internal/app/backend"
-	"open-match.dev/open-match/internal/appmain"
+	"open-match.dev/open-match/internal/config"
 )

 func main() {
-	appmain.RunApplication("backend", backend.BindService)
+	app.RunApplication("backend", config.Read, backend.BindService)
 }
--- a/cmd/frontend/frontend.go
+++ b/cmd/frontend/frontend.go
@ -16,10 +16,11 @@
 package main

 import (
+	"open-match.dev/open-match/internal/app"
 	"open-match.dev/open-match/internal/app/frontend"
-	"open-match.dev/open-match/internal/appmain"
+	"open-match.dev/open-match/internal/config"
 )

 func main() {
-	appmain.RunApplication("frontend", frontend.BindService)
+	app.RunApplication("frontend", config.Read, frontend.BindService)
 }
--- a/cmd/minimatch/main.go
+++ b/cmd/minimatch/main.go
@ -16,10 +16,11 @@
 package main

 import (
+	"open-match.dev/open-match/internal/app"
 	"open-match.dev/open-match/internal/app/minimatch"
-	"open-match.dev/open-match/internal/appmain"
+	"open-match.dev/open-match/internal/config"
 )

 func main() {
-	appmain.RunApplication("minimatch", minimatch.BindService)
+	app.RunApplication("minimatch", config.Read, minimatch.BindService)
 }
--- a/cmd/query/query.go
+++ b/cmd/query/query.go
@ -16,10 +16,11 @@
 package main

 import (
+	"open-match.dev/open-match/internal/app"
 	"open-match.dev/open-match/internal/app/query"
-	"open-match.dev/open-match/internal/appmain"
+	"open-match.dev/open-match/internal/config"
 )

 func main() {
-	appmain.RunApplication("query", query.BindService)
+	app.RunApplication("query", config.Read, query.BindService)
 }
--- a/cmd/scale-backend/main.go
+++ b/cmd/scale-backend/main.go
@ -16,9 +16,10 @@ package main

 import (
 	"open-match.dev/open-match/examples/scale/backend"
-	"open-match.dev/open-match/internal/appmain"
+	"open-match.dev/open-match/internal/app"
+	"open-match.dev/open-match/internal/config"
 )

 func main() {
-	appmain.RunApplication("scale", backend.BindService)
+	app.RunApplication("scale", config.Read, backend.BindService)
 }
--- a/cmd/scale-frontend/main.go
+++ b/cmd/scale-frontend/main.go
@ -16,9 +16,10 @@ package main

 import (
 	"open-match.dev/open-match/examples/scale/frontend"
-	"open-match.dev/open-match/internal/appmain"
+	"open-match.dev/open-match/internal/app"
+	"open-match.dev/open-match/internal/config"
 )

 func main() {
-	appmain.RunApplication("scale", frontend.BindService)
+	app.RunApplication("scale", config.Read, frontend.BindService)
 }
--- a/cmd/synchronizer/synchronizer.go
+++ b/cmd/synchronizer/synchronizer.go
@ -16,10 +16,11 @@
 package main

 import (
+	"open-match.dev/open-match/internal/app"
 	"open-match.dev/open-match/internal/app/synchronizer"
-	"open-match.dev/open-match/internal/appmain"
+	"open-match.dev/open-match/internal/config"
 )

 func main() {
-	appmain.RunApplication("synchronizer", synchronizer.BindService)
+	app.RunApplication("synchronizer", config.Read, synchronizer.BindService)
 }
--- a/docs/development.md
+++ b/docs/development.md
@ -9,12 +9,14 @@ To build Open Match you'll need the following applications installed.

 * [Git](https://git-scm.com/downloads)
 * [Go](https://golang.org/doc/install)
+ * [Python3 with virtualenv](https://wiki.python.org/moin/BeginnersGuide/Download)
 * Make (Mac: install [XCode](https://itunes.apple.com/us/app/xcode/id497799835))
 * [Docker](https://docs.docker.com/install/) including the
   [post-install steps](https://docs.docker.com/install/linux/linux-postinstall/).

 Optional Software

+ * [Google Cloud Platform](gcloud.md)
 * [Visual Studio Code](https://code.visualstudio.com/Download) for IDE.
   Vim and Emacs work to.
 * [VirtualBox](https://www.virtualbox.org/wiki/Downloads) recommended for
@ -25,7 +27,8 @@ running:

 ```bash
 sudo apt-get update
-sudo apt-get install -y -q make google-cloud-sdk git unzip tar
+sudo apt-get install -y -q python3 python3-virtualenv virtualenv make \
+  google-cloud-sdk git unzip tar
 ```

 *It's recommended that you install Go using their instructions because package
@ -46,13 +49,15 @@ make

 *Typically for contributing you'll want to
 [create a fork](https://help.github.com/en/articles/fork-a-repo) and use that
-but for purpose of this guide we'll be using the upstream/main.*
+but for purpose of this guide we'll be using the upstream/master.*

-## Building code and images
+## Building

 ```bash
 # Reset workspace
 make clean
+# Compile all the binaries
+make all -j$(nproc)
 # Run tests
 make test
 # Build all the images.
@ -82,9 +87,11 @@ default context the Makefile will honor that._
 # GKE cluster: make create-gke-cluster/delete-gke-cluster
 # or create a local Minikube cluster
 make create-gke-cluster
-# Step 2: Build and Push Open Match Images to gcr.io
+# Step 2: Download helm and install Tiller in the cluster
+make push-helm
+# Step 3: Build and Push Open Match Images to gcr.io
 make push-images -j$(nproc)
-# Step 3: Install Open Match in the cluster.
+# Install Open Match in the cluster.
 make install-chart

 # Create a proxy to Open Match pods so that you can access them locally.
@ -98,29 +105,12 @@ make proxy
 make delete-chart
 ```

-## Iterating
-While iterating on the project, you may need to:
-1. Install/Run everything
-2. Make some code changes
-3. Make sure the changes compile by running `make test`
-4. Build and push Docker images to your personal registry by running `make push-images -j$(nproc)`
-5. Deploy the code change by running `make install-chart`
-6. Verify it's working by [looking at the logs](#accessing-logs) or looking at the monitoring dashboard by running `make proxy-grafana`
-7. Tear down Open Match by running `make delete-chart`
+## Interaction

-## Accessing logs
-To look at Open Match core services' logs, run:
-```bash
-# Replace open-match-frontend with the service name that you would like to access
-kubectl logs -n open-match svc/open-match-frontend
-```
+Before integrating with Open Match you can manually interact with it to get a feel for how it works.

-## API References
-While integrating with Open Match you may want to understand its API surface concepts or interact with it and get a feel for how it works.
-
-The APIs are defined in `proto` format under the `api/` folder, with references available at [open-match.dev](https://open-match.dev/site/docs/reference/api/).
-
-You can also run `make proxy-ui` to exposes the Swagger UI for Open Match locally on your computer after [deploying it to Kubernetes](#deploying-to-kubernetes), then go to http://localhost:51500 and view the REST APIs as well as interactively call Open Match.
+`make proxy-ui` exposes the Swagger UI for Open Match locally on your computer.
+You can then go to http://localhost:51500 and view the API as well as interactively call Open Match.

 By default you will be talking to the frontend server but you can change the target API url to any of the following:

@ -154,9 +144,55 @@ export GOPATH=$HOME/workspace/

 ## Pull Requests

-If you want to submit a Pull Request, `make presubmit` can catch most of the issues your change can run into.
+If you want to submit a Pull Request there's some tools to help prepare your
+change.
+
+```bash
+# Runs code generators, tests, and linters.
+make presubmit
+```
+
+`make presubmit` catches most of the issues your change can run into. If the
+submit checks fail you can run it locally via,
+
+```bash
+make local-cloud-build
+```

 Our [continuous integration](https://console.cloud.google.com/cloud-build/builds?project=open-match-build)
 runs against all PRs. In order to see your build results you'll need to
 become a member of
 [open-match-discuss@googlegroups.com](https://groups.google.com/forum/#!forum/open-match-discuss).
+
+
+## Makefile
+
+The Makefile is the core of Open Match's build process. There's a lot of
+commands but here's a list of the important ones and patterns to remember them.
+
+```bash
+# Help
+make
+
+# Reset workspace (delete all build artifacts)
+make clean
+# Delete auto-generated protobuf code and swagger API docs.
+make clean-protos clean-swagger-docs
+# make clean-* deletes some part of the build outputs.
+
+# Build all Docker images
+make build-images
+# Build frontend docker image.
+make build-frontend-image
+
+# Formats, Vets, and tests the codebase.
+make fmt vet test
+# Same as above also regenerates autogen files.
+make presubmit
+
+# Run website on http://localhost:8080
+make run-site
+
+# Proxy all Open Match processes to view them.
+make proxy
+```
--- a/docs/governance/templates/release.sh
+++ b/docs/governance/templates/release.sh
@ -12,13 +12,24 @@ SOURCE_VERSION=$1
 DEST_VERSION=$2
 SOURCE_PROJECT_ID=open-match-build
 DEST_PROJECT_ID=open-match-public-images
-IMAGE_NAMES=$(make list-images)
+IMAGE_NAMES="openmatch-backend openmatch-frontend openmatch-query openmatch-synchronizer openmatch-minimatch openmatch-demo-first-match openmatch-mmf-go-soloduel openmatch-mmf-go-pool openmatch-evaluator-go-simple openmatch-swaggerui openmatch-reaper"

 for name in $IMAGE_NAMES
 do
-    source_image=gcr.io/$SOURCE_PROJECT_ID/openmatch-$name:$SOURCE_VERSION
-    dest_image=gcr.io/$DEST_PROJECT_ID/openmatch-$name:$DEST_VERSION
+    source_image=gcr.io/$SOURCE_PROJECT_ID/$name:$SOURCE_VERSION
+    dest_image=gcr.io/$DEST_PROJECT_ID/$name:$DEST_VERSION
    docker pull $source_image
    docker tag $source_image $dest_image
    docker push $dest_image
 done
+
+echo "=============================================================="
+echo "=============================================================="
+echo "=============================================================="
+echo "=============================================================="
+
+echo "Add these lines to your release notes:"
+for name in $IMAGE_NAMES
+do
+    echo "docker pull gcr.io/$DEST_PROJECT_ID/$name:$DEST_VERSION"
+done
--- a/docs/hugo_apiheader.txt
+++ b/docs/hugo_apiheader.txt
@ -1,7 +0,0 @@
---
-title: "Open Match API References" 
-linkTitle: "Open Match API References" 
-weight: 2 
-description: 
-  This document provides API references for Open Match services. 
---
--- a/examples/demo/bytesub/bytesub.go
+++ b/examples/demo/bytesub/bytesub.go
@ -37,7 +37,7 @@ func New() *ByteSub {
 	}
 }

-// AnnounceLatest writes b to all of the subscribers, with caveats listed in Subscribe.
+// AnnounceLatest writes b to all of the subscribers, with caviets listed in Subscribe.
 func (s *ByteSub) AnnounceLatest(b []byte) {
 	s.r.Lock()
 	defer s.r.Unlock()
--- a/examples/demo/bytesub/bytesub_test.go
+++ b/examples/demo/bytesub/bytesub_test.go
@ -51,7 +51,7 @@ func TestFastAndSlow(t *testing.T) {
 	for count := 0; true; count++ {
 		if v := <-slow; v == "3" {
 			if count > 1 {
-				t.Error("Expected to receive at most 1 other value on slow before receiving the latest value.")
+				t.Error("Expected to recieve at most 1 other value on slow before recieving the latest value.")
 			}
 			break
 		}
--- a/examples/demo/components/clients/clients.go
+++ b/examples/demo/components/clients/clients.go
@ -81,7 +81,7 @@ func runScenario(ctx context.Context, name string, update updater.SetFunc) {
 	update(s)

 	// See https://open-match.dev/site/docs/guides/api/
-	conn, err := grpc.Dial("open-match-frontend.open-match.svc.cluster.local:50504", grpc.WithInsecure())
+	conn, err := grpc.Dial("om-frontend.open-match.svc.cluster.local:50504", grpc.WithInsecure())
 	if err != nil {
 		panic(err)
 	}
@ -102,7 +102,7 @@ func runScenario(ctx context.Context, name string, update updater.SetFunc) {
 		if err != nil {
 			panic(err)
 		}
-		ticketId = resp.Id
+		ticketId = resp.Ticket.Id
 	}

 	//////////////////////////////////////////////////////////////////////////////
@ -111,11 +111,11 @@ func runScenario(ctx context.Context, name string, update updater.SetFunc) {

 	var assignment *pb.Assignment
 	{
-		req := &pb.WatchAssignmentsRequest{
+		req := &pb.GetAssignmentsRequest{
 			TicketId: ticketId,
 		}

-		stream, err := fe.WatchAssignments(ctx, req)
+		stream, err := fe.GetAssignments(ctx, req)
 		for assignment.GetConnection() == "" {
 			resp, err := stream.Recv()
 			if err != nil {
--- a/examples/demo/components/director/director.go
+++ b/examples/demo/components/director/director.go
@ -68,7 +68,7 @@ func run(ds *components.DemoShared) {
 	ds.Update(s)

 	// See https://open-match.dev/site/docs/guides/api/
-	conn, err := grpc.Dial("open-match-backend.open-match.svc.cluster.local:50505", grpc.WithInsecure())
+	conn, err := grpc.Dial("om-backend.open-match.svc.cluster.local:50505", grpc.WithInsecure())
 	if err != nil {
 		panic(err)
 	}
@ -131,13 +131,9 @@ func run(ds *components.DemoShared) {
 		}

 		req := &pb.AssignTicketsRequest{
-			Assignments: []*pb.AssignmentGroup{
-				{
-					TicketIds: ids,
-					Assignment: &pb.Assignment{
-						Connection: fmt.Sprintf("%d.%d.%d.%d:2222", rand.Intn(256), rand.Intn(256), rand.Intn(256), rand.Intn(256)),
-					},
-				},
+			TicketIds: ids,
+			Assignment: &pb.Assignment{
+				Connection: fmt.Sprintf("%d.%d.%d.%d:2222", rand.Intn(256), rand.Intn(256), rand.Intn(256), rand.Intn(256)),
 			},
 		}

--- a/examples/demo/updater/updater.go
+++ b/examples/demo/updater/updater.go
@ -37,7 +37,7 @@ type Updater struct {
 type SetFunc func(v interface{})

 // New creates an Updater.  Set is called when fields update, using the json
-// serialized value of Updater's tree.  All updates after ctx is canceled are
+// sererialized value of Updater's tree.  All updates after ctx is canceled are
 // ignored.
 func New(ctx context.Context, set func([]byte)) *Updater {
 	f := func(v interface{}) {
--- a/examples/functions/golang/backfill/mmf/matchfunction.go
+++ b/examples/functions/golang/backfill/mmf/matchfunction.go
@ -1,297 +0,0 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package mmf provides a sample match function that uses the GRPC harness to set up 1v1 matches.
-// This sample is a reference to demonstrate the usage of backfill and should only be used as
-// a starting point for your match function. You will need to modify the
-// matchmaking logic in this function based on your game's requirements.
-package mmf
-
-import (
-	"fmt"
-	"time"
-
-	"log"
-
-	"github.com/golang/protobuf/ptypes"
-	"github.com/golang/protobuf/ptypes/any"
-	"github.com/golang/protobuf/ptypes/wrappers"
-	"google.golang.org/grpc"
-	"open-match.dev/open-match/pkg/matchfunction"
-	"open-match.dev/open-match/pkg/pb"
-)
-
-const (
-	playersPerMatch = 2
-	openSlotsKey    = "open-slots"
-	matchName       = "backfill-matchfunction"
-)
-
-// matchFunctionService implements pb.MatchFunctionServer, the server generated
-// by compiling the protobuf, by fulfilling the pb.MatchFunctionServer interface.
-type matchFunctionService struct {
-	grpc               *grpc.Server
-	queryServiceClient pb.QueryServiceClient
-	port               int
-}
-
-func (s *matchFunctionService) Run(req *pb.RunRequest, stream pb.MatchFunction_RunServer) error {
-	log.Printf("Generating proposals for function %v", req.GetProfile().GetName())
-
-	var proposals []*pb.Match
-	profile := req.GetProfile()
-	pools := profile.GetPools()
-
-	for _, p := range pools {
-		tickets, err := matchfunction.QueryPool(stream.Context(), s.queryServiceClient, p)
-		if err != nil {
-			log.Printf("Failed to query tickets for the given pool, got %s", err.Error())
-			return err
-		}
-
-		backfills, err := matchfunction.QueryBackfillPool(stream.Context(), s.queryServiceClient, p)
-		if err != nil {
-			log.Printf("Failed to query backfills for the given pool, got %s", err.Error())
-			return err
-		}
-
-		matches, err := makeMatches(profile, p, tickets, backfills)
-		if err != nil {
-			log.Printf("Failed to generate matches, got %s", err.Error())
-			return err
-		}
-
-		proposals = append(proposals, matches...)
-	}
-
-	log.Printf("Streaming %v proposals to Open Match", len(proposals))
-	// Stream the generated proposals back to Open Match.
-	for _, proposal := range proposals {
-		if err := stream.Send(&pb.RunResponse{Proposal: proposal}); err != nil {
-			log.Printf("Failed to stream proposals to Open Match, got %s", err.Error())
-			return err
-		}
-	}
-
-	return nil
-}
-
-// makeMatches tries to handle backfills at first, then it makes full matches, at the end it makes a match with backfill
-// if tickets left
-func makeMatches(profile *pb.MatchProfile, pool *pb.Pool, tickets []*pb.Ticket, backfills []*pb.Backfill) ([]*pb.Match, error) {
-	var matches []*pb.Match
-	newMatches, remainingTickets, err := handleBackfills(profile, tickets, backfills, len(matches))
-	if err != nil {
-		return nil, err
-	}
-
-	matches = append(matches, newMatches...)
-	newMatches, remainingTickets = makeFullMatches(profile, remainingTickets, len(matches))
-	matches = append(matches, newMatches...)
-
-	if len(remainingTickets) > 0 {
-		match, err := makeMatchWithBackfill(profile, pool, remainingTickets, len(matches))
-		if err != nil {
-			return nil, err
-		}
-
-		matches = append(matches, match)
-	}
-
-	return matches, nil
-}
-
-// handleBackfills looks at each backfill's openSlots which is a number of required tickets,
-// acquires that tickets, decreases openSlots in backfill and makes a match with updated backfill and associated tickets.
-func handleBackfills(profile *pb.MatchProfile, tickets []*pb.Ticket, backfills []*pb.Backfill, lastMatchId int) ([]*pb.Match, []*pb.Ticket, error) {
-	matchId := lastMatchId
-	var matches []*pb.Match
-
-	for _, b := range backfills {
-		openSlots, err := getOpenSlots(b)
-		if err != nil {
-			return nil, tickets, err
-		}
-
-		var matchTickets []*pb.Ticket
-		for openSlots > 0 && len(tickets) > 0 {
-			matchTickets = append(matchTickets, tickets[0])
-			tickets = tickets[1:]
-			openSlots--
-		}
-
-		if len(matchTickets) > 0 {
-			err := setOpenSlots(b, openSlots)
-			if err != nil {
-				return nil, tickets, err
-			}
-
-			matchId++
-			match := newMatch(matchId, profile.Name, matchTickets, b)
-			matches = append(matches, &match)
-		}
-	}
-
-	return matches, tickets, nil
-}
-
-// makeMatchWithBackfill makes not full match, creates backfill for it with openSlots = playersPerMatch-len(tickets).
-func makeMatchWithBackfill(profile *pb.MatchProfile, pool *pb.Pool, tickets []*pb.Ticket, lastMatchId int) (*pb.Match, error) {
-	if len(tickets) == 0 {
-		return nil, fmt.Errorf("tickets are required")
-	}
-
-	if len(tickets) >= playersPerMatch {
-		return nil, fmt.Errorf("too many tickets")
-	}
-
-	matchId := lastMatchId
-	searchFields := newSearchFields(pool)
-	backfill, err := newBackfill(searchFields, playersPerMatch-len(tickets))
-	if err != nil {
-		return nil, err
-	}
-
-	matchId++
-	match := newMatch(matchId, profile.Name, tickets, backfill)
-	// indicates that it is a new match and new game server should be allocated for it
-	match.AllocateGameserver = true
-
-	return &match, nil
-}
-
-// makeFullMatches makes matches without backfill
-func makeFullMatches(profile *pb.MatchProfile, tickets []*pb.Ticket, lastMatchId int) ([]*pb.Match, []*pb.Ticket) {
-	ticketNum := 0
-	matchId := lastMatchId
-	var matches []*pb.Match
-
-	for ticketNum < playersPerMatch && len(tickets) >= playersPerMatch {
-		ticketNum++
-
-		if ticketNum == playersPerMatch {
-			matchId++
-
-			match := newMatch(matchId, profile.Name, tickets[:playersPerMatch], nil)
-			matches = append(matches, &match)
-
-			tickets = tickets[playersPerMatch:]
-			ticketNum = 0
-		}
-	}
-
-	return matches, tickets
-}
-
-// newSearchFields creates search fields based on pool's search criteria. This is just example of how it can be done.
-func newSearchFields(pool *pb.Pool) *pb.SearchFields {
-	searchFields := pb.SearchFields{}
-	rangeFilters := pool.GetDoubleRangeFilters()
-
-	if rangeFilters != nil {
-		doubleArgs := make(map[string]float64)
-		for _, f := range rangeFilters {
-			doubleArgs[f.DoubleArg] = (f.Max - f.Min) / 2
-		}
-
-		if len(doubleArgs) > 0 {
-			searchFields.DoubleArgs = doubleArgs
-		}
-	}
-
-	stringFilters := pool.GetStringEqualsFilters()
-
-	if stringFilters != nil {
-		stringArgs := make(map[string]string)
-		for _, f := range stringFilters {
-			stringArgs[f.StringArg] = f.Value
-		}
-
-		if len(stringArgs) > 0 {
-			searchFields.StringArgs = stringArgs
-		}
-	}
-
-	tagFilters := pool.GetTagPresentFilters()
-
-	if tagFilters != nil {
-		tags := make([]string, len(tagFilters))
-		for _, f := range tagFilters {
-			tags = append(tags, f.Tag)
-		}
-
-		if len(tags) > 0 {
-			searchFields.Tags = tags
-		}
-	}
-
-	return &searchFields
-}
-
-func newBackfill(searchFields *pb.SearchFields, openSlots int) (*pb.Backfill, error) {
-	b := pb.Backfill{
-		SearchFields: searchFields,
-		Generation:   0,
-		CreateTime:   ptypes.TimestampNow(),
-	}
-
-	err := setOpenSlots(&b, int32(openSlots))
-	return &b, err
-}
-
-func newMatch(num int, profile string, tickets []*pb.Ticket, b *pb.Backfill) pb.Match {
-	t := time.Now().Format("2006-01-02T15:04:05.00")
-
-	return pb.Match{
-		MatchId:       fmt.Sprintf("profile-%s-time-%s-num-%d", profile, t, num),
-		MatchProfile:  profile,
-		MatchFunction: matchName,
-		Tickets:       tickets,
-		Backfill:      b,
-	}
-}
-
-func setOpenSlots(b *pb.Backfill, val int32) error {
-	if b.Extensions == nil {
-		b.Extensions = make(map[string]*any.Any)
-	}
-
-	any, err := ptypes.MarshalAny(&wrappers.Int32Value{Value: val})
-	if err != nil {
-		return err
-	}
-
-	b.Extensions[openSlotsKey] = any
-	return nil
-}
-
-func getOpenSlots(b *pb.Backfill) (int32, error) {
-	if b == nil {
-		return 0, fmt.Errorf("expected backfill is not nil")
-	}
-
-	if b.Extensions != nil {
-		if any, ok := b.Extensions[openSlotsKey]; ok {
-			var val wrappers.Int32Value
-			err := ptypes.UnmarshalAny(any, &val)
-			if err != nil {
-				return 0, err
-			}
-
-			return val.Value, nil
-		}
-	}
-
-	return playersPerMatch, nil
-}
--- a/examples/functions/golang/backfill/mmf/matchfunction_test.go
+++ b/examples/functions/golang/backfill/mmf/matchfunction_test.go
@ -1,142 +0,0 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-package mmf
-
-import (
-	"testing"
-
-	"github.com/golang/protobuf/ptypes"
-	"github.com/golang/protobuf/ptypes/any"
-	"github.com/golang/protobuf/ptypes/wrappers"
-	"github.com/stretchr/testify/require"
-	"open-match.dev/open-match/pkg/pb"
-)
-
-func TestHandleBackfills(t *testing.T) {
-	for _, tc := range []struct {
-		name              string
-		tickets           []*pb.Ticket
-		backfills         []*pb.Backfill
-		lastMatchId       int
-		expectedMatchLen  int
-		expectedTicketLen int
-		expectedOpenSlots int32
-		expectedErr       bool
-	}{
-		{name: "returns no matches when no backfills specified", expectedMatchLen: 0, expectedTicketLen: 0},
-		{name: "returns no matches when no tickets specified", expectedMatchLen: 0, expectedTicketLen: 0},
-		{name: "returns a match with open slots decreased", tickets: []*pb.Ticket{{Id: "1"}}, backfills: []*pb.Backfill{withOpenSlots(1)}, expectedMatchLen: 1, expectedTicketLen: 0, expectedOpenSlots: playersPerMatch - 2},
-	} {
-		testCase := tc
-		t.Run(testCase.name, func(t *testing.T) {
-			t.Parallel()
-
-			profile := pb.MatchProfile{Name: "matchProfile"}
-			matches, tickets, err := handleBackfills(&profile, testCase.tickets, testCase.backfills, testCase.lastMatchId)
-			require.Equal(t, testCase.expectedErr, err != nil)
-			require.Equal(t, testCase.expectedTicketLen, len(tickets))
-
-			if err != nil {
-				require.Equal(t, 0, len(matches))
-			} else {
-				for _, m := range matches {
-					require.NotNil(t, m.Backfill)
-
-					openSlots, err := getOpenSlots(m.Backfill)
-					require.NoError(t, err)
-					require.Equal(t, testCase.expectedOpenSlots, openSlots)
-				}
-			}
-		})
-	}
-}
-
-func TestMakeMatchWithBackfill(t *testing.T) {
-	for _, testCase := range []struct {
-		name              string
-		tickets           []*pb.Ticket
-		lastMatchId       int
-		expectedOpenSlots int32
-		expectedErr       bool
-	}{
-		{name: "returns an error when length of tickets is greater then playerPerMatch", tickets: []*pb.Ticket{{Id: "1"}, {Id: "2"}, {Id: "3"}, {Id: "4"}, {Id: "5"}}, expectedErr: true},
-		{name: "returns an error when length of tickets is equal to playerPerMatch", tickets: []*pb.Ticket{{Id: "1"}, {Id: "2"}, {Id: "3"}, {Id: "4"}}, expectedErr: true},
-		{name: "returns an error when no tickets are provided", expectedErr: true},
-		{name: "returns a match with backfill", tickets: []*pb.Ticket{{Id: "1"}}, expectedOpenSlots: playersPerMatch - 1},
-	} {
-		testCase := testCase
-		t.Run(testCase.name, func(t *testing.T) {
-			t.Parallel()
-
-			pool := pb.Pool{}
-			profile := pb.MatchProfile{Name: "matchProfile"}
-			match, err := makeMatchWithBackfill(&profile, &pool, testCase.tickets, testCase.lastMatchId)
-			require.Equal(t, testCase.expectedErr, err != nil)
-
-			if err == nil {
-				require.NotNil(t, match)
-				require.NotNil(t, match.Backfill)
-				require.True(t, match.AllocateGameserver)
-				require.Equal(t, "", match.Backfill.Id)
-
-				openSlots, err := getOpenSlots(match.Backfill)
-				require.Nil(t, err)
-				require.Equal(t, testCase.expectedOpenSlots, openSlots)
-			}
-		})
-
-	}
-}
-
-func TestMakeFullMatches(t *testing.T) {
-	for _, testCase := range []struct {
-		name              string
-		tickets           []*pb.Ticket
-		lastMatchId       int
-		expectedMatchLen  int
-		expectedTicketLen int
-	}{
-		{name: "returns no matches when there are no tickets", tickets: []*pb.Ticket{}, expectedMatchLen: 0, expectedTicketLen: 0},
-		{name: "returns no matches when length of tickets is less then playersPerMatch", tickets: []*pb.Ticket{{Id: "1"}}, expectedMatchLen: 0, expectedTicketLen: 1},
-		{name: "returns a match when length of tickets is greater then playersPerMatch", tickets: []*pb.Ticket{{Id: "1"}, {Id: "2"}}, expectedMatchLen: 1, expectedTicketLen: 0},
-	} {
-		testCase := testCase
-		t.Run(testCase.name, func(t *testing.T) {
-			t.Parallel()
-			profile := pb.MatchProfile{Name: "matchProfile"}
-			matches, tickets := makeFullMatches(&profile, testCase.tickets, testCase.lastMatchId)
-
-			require.Equal(t, testCase.expectedMatchLen, len(matches))
-			require.Equal(t, testCase.expectedTicketLen, len(tickets))
-
-			for _, m := range matches {
-				require.Nil(t, m.Backfill)
-				require.Equal(t, playersPerMatch, len(m.Tickets))
-			}
-		})
-	}
-}
-
-func withOpenSlots(openSlots int) *pb.Backfill {
-	val, err := ptypes.MarshalAny(&wrappers.Int32Value{Value: int32(openSlots)})
-	if err != nil {
-		panic(err)
-	}
-
-	return &pb.Backfill{
-		Extensions: map[string]*any.Any{
-			openSlotsKey: val,
-		},
-	}
-}
--- a/examples/functions/golang/backfill/mmf/server.go
+++ b/examples/functions/golang/backfill/mmf/server.go
@ -1,59 +0,0 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package mmf provides a sample match function that uses the GRPC harness to set up 1v1 matches.
-// This sample is a reference to demonstrate the usage of backfill and should only be used as
-// a starting point for your match function. You will need to modify the
-// matchmaking logic in this function based on your game's requirements.
-package mmf
-
-import (
-	"fmt"
-	"log"
-	"net"
-
-	"google.golang.org/grpc"
-	"open-match.dev/open-match/pkg/pb"
-)
-
-func Start(queryServiceAddr string, serverPort int) {
-	// Connect to QueryService.
-	conn, err := grpc.Dial(queryServiceAddr, grpc.WithInsecure())
-
-	if err != nil {
-		log.Fatalf("Failed to connect to Open Match, got %s", err.Error())
-	}
-
-	defer conn.Close()
-
-	mmfService := matchFunctionService{
-		queryServiceClient: pb.NewQueryServiceClient(conn),
-	}
-
-	// Create and host a new gRPC service on the configured port.
-	server := grpc.NewServer()
-	pb.RegisterMatchFunctionServer(server, &mmfService)
-	ln, err := net.Listen("tcp", fmt.Sprintf(":%d", serverPort))
-
-	if err != nil {
-		log.Fatalf("TCP net listener initialization failed for port %v, got %s", serverPort, err.Error())
-	}
-
-	log.Printf("TCP net listener initialized for port %v", serverPort)
-	err = server.Serve(ln)
-
-	if err != nil {
-		log.Fatalf("gRPC serve failed, got %s", err.Error())
-	}
-}
--- a/examples/functions/golang/soloduel/main.go
+++ b/examples/functions/golang/soloduel/main.go
@ -24,8 +24,8 @@ import (
 )

 const (
-	queryServiceAddr = "open-match-query.open-match.svc.cluster.local:50503" // Address of the QueryService endpoint.
-	serverPort       = 50502                                                 // The port for hosting the Match Function.
+	queryServiceAddr = "om-query.open-match.svc.cluster.local:50503" // Address of the QueryService endpoint.
+	serverPort       = 50502                                         // The port for hosting the Match Function.
 )

 func main() {
--- a/examples/functions/golang/soloduel/mmf/matchfunction_test.go
+++ b/examples/functions/golang/soloduel/mmf/matchfunction_test.go
@ -19,11 +19,11 @@ import (

 	"open-match.dev/open-match/pkg/pb"

-	"github.com/stretchr/testify/require"
+	"github.com/stretchr/testify/assert"
 )

 func TestMakeMatchesDeduplicate(t *testing.T) {
-	require := require.New(t)
+	assert := assert.New(t)

 	poolNameToTickets := map[string][]*pb.Ticket{
 		"pool1": {{Id: "1"}},
@ -31,12 +31,12 @@ func TestMakeMatchesDeduplicate(t *testing.T) {
 	}

 	matches, err := makeMatches(poolNameToTickets)
-	require.Nil(err)
-	require.Equal(len(matches), 0)
+	assert.Nil(err)
+	assert.Equal(len(matches), 0)
 }

 func TestMakeMatches(t *testing.T) {
-	require := require.New(t)
+	assert := assert.New(t)

 	poolNameToTickets := map[string][]*pb.Ticket{
 		"pool1": {{Id: "1"}, {Id: "2"}, {Id: "3"}},
@ -45,11 +45,11 @@ func TestMakeMatches(t *testing.T) {
 	}

 	matches, err := makeMatches(poolNameToTickets)
-	require.Nil(err)
-	require.Equal(len(matches), 3)
+	assert.Nil(err)
+	assert.Equal(len(matches), 3)

 	for _, match := range matches {
-		require.Equal(2, len(match.Tickets))
-		require.Equal(matchName, match.MatchFunction)
+		assert.Equal(2, len(match.Tickets))
+		assert.Equal(matchName, match.MatchFunction)
 	}
 }
--- a/examples/scale/README.md
+++ b/examples/scale/README.md
@ -1,20 +0,0 @@
-## How to use this framework
-
-This is the framework that we use to benchmark Open Match against different matchmaking scenarios. For now (02/24/2020), this framework supports a Battle Royale, a Basic 1v1 matchmaking, and a Team Shooter scenario. You are welcome to write up your own `Scenario`, test it, and share the number that you are able to get to us. 
-
-1. The `Scenario` struct under the `scenarios/scenarios.go` file defines the parameters that this framework currently support/plan to support.
-2. Each subpackage `battleroyal`, `firstmatch`, and `teamshooter` implements to `GameScenario` interface defined under `scenarios/scenarios.go` file. Feel free to write your own benchmark scenario by implementing the interface. 
-   - Ticket   `func() *pb.Ticket` - Tickets generator
-   - Profiles `func() []*pb.MatchProfile` - Profiles generator
-   - MMF      `MatchFunction(p *pb.MatchProfile, poolTickets map[string][]*pb.Ticket) ([]*pb.Match, error)` - Custom matchmaking logic using a MatchProfile and a map struct that contains the mapping from pool name to the tickets of that pool.
-   - Evaluate `Evaluate(stream pb.Evaluator_EvaluateServer) error` - Custom logic implementation of the evaluator.
-
-Follow the instructions below if you want to use any of the existing benchmarking scenarios.
-
-1. Open the `scenarios.go` file under the scenarios directory.
-2. Change the value of the `ActiveScenario` variable to the scenario that you would like Open Match to run against.
-3. Make sure you have `kubectl` connected to an existing Kubernetes cluster and run `make push-images` followed by `make install-scale-chart` to push the images and install Open Match core along with the scale components in the cluster.
-4. Run `make proxy` 
-   - Open `localhost:3000` to see the Grafana dashboards.
-   - Open `localhost:9090` to see the Prometheus query server.
-   - Open `localhost:[COMPONENT_HTTP_ENDPOINT]/help` to see how to access the zpages.
--- a/examples/scale/backend/backend.go
+++ b/examples/scale/backend/backend.go
@ -25,7 +25,6 @@ import (
 	"github.com/sirupsen/logrus"
 	"go.opencensus.io/trace"
 	"open-match.dev/open-match/examples/scale/scenarios"
-	"open-match.dev/open-match/internal/appmain"
 	"open-match.dev/open-match/internal/config"
 	"open-match.dev/open-match/internal/rpc"
 	"open-match.dev/open-match/internal/telemetry"
@ -39,23 +38,24 @@ var (
 	})

 	activeScenario = scenarios.ActiveScenario
+	statProcessor  = scenarios.NewStatProcessor()

-	mIterations            = telemetry.Counter("scale_backend_iterations", "fetch match iterations")
-	mFetchMatchCalls       = telemetry.Counter("scale_backend_fetch_match_calls", "fetch match calls")
-	mFetchMatchSuccesses   = telemetry.Counter("scale_backend_fetch_match_successes", "fetch match successes")
-	mFetchMatchErrors      = telemetry.Counter("scale_backend_fetch_match_errors", "fetch match errors")
-	mMatchesReturned       = telemetry.Counter("scale_backend_matches_returned", "matches returned")
-	mSumTicketsReturned    = telemetry.Counter("scale_backend_sum_tickets_returned", "tickets in matches returned")
-	mMatchesAssigned       = telemetry.Counter("scale_backend_matches_assigned", "matches assigned")
-	mMatchAssignsFailed    = telemetry.Counter("scale_backend_match_assigns_failed", "match assigns failed")
-	mBackfillsDeleted      = telemetry.Counter("scale_backend_backfills_deleted", "backfills deleted")
-	mBackfillDeletesFailed = telemetry.Counter("scale_backend_backfill_deletes_failed", "backfill deletes failed")
+	mIterations          = telemetry.Counter("scale_backend_iterations", "fetch match iterations")
+	mFetchMatchCalls     = telemetry.Counter("scale_backend_fetch_match_calls", "fetch match calls")
+	mFetchMatchSuccesses = telemetry.Counter("scale_backend_fetch_match_successes", "fetch match successes")
+	mFetchMatchErrors    = telemetry.Counter("scale_backend_fetch_match_errors", "fetch match errors")
+	mMatchesReturned     = telemetry.Counter("scale_backend_matches_returned", "matches returned")
+	mSumTicketsReturned  = telemetry.Counter("scale_backend_sum_tickets_returned", "tickets in matches returned")
+	mMatchesAssigned     = telemetry.Counter("scale_backend_matches_assigned", "matches assigned")
+	mMatchAssignsFailed  = telemetry.Counter("scale_backend_match_assigns_failed", "match assigns failed")
+	mTicketsDeleted      = telemetry.Counter("scale_backend_tickets_deleted", "tickets deleted")
+	mTicketDeletesFailed = telemetry.Counter("scale_backend_ticket_deletes_failed", "ticket deletes failed")
 )

 // Run triggers execution of functions that continuously fetch, assign and
 // delete matches.
-func BindService(p *appmain.Params, b *appmain.Bindings) error {
-	go run(p.Config())
+func BindService(p *rpc.ServerParams, cfg config.View) error {
+	go run(cfg)
 	return nil
 }

@ -76,31 +76,17 @@ func run(cfg config.View) {
 	defer feConn.Close()
 	fe := pb.NewFrontendServiceClient(feConn)

+	startTime := time.Now()
+
 	w := logger.Writer()
 	defer w.Close()

-	matchesToAssign := make(chan *pb.Match, 30000)
+	matchesForAssignment := make(chan *pb.Match, 30000)
+	ticketsForDeletion := make(chan string, 30000)

-	if activeScenario.BackendAssignsTickets {
-		for i := 0; i < 100; i++ {
-			go runAssignments(be, matchesToAssign)
-		}
-	}
-
-	backfillsToDelete := make(chan *pb.Backfill, 30000)
-
-	if activeScenario.BackendDeletesBackfills {
-		for i := 0; i < 100; i++ {
-			go runDeleteBackfills(fe, backfillsToDelete)
-		}
-	}
-
-	matchesToAcknowledge := make(chan *pb.Match, 30000)
-
-	if activeScenario.BackendAcknowledgesBackfills {
-		for i := 0; i < 100; i++ {
-			go runAcknowledgeBackfills(fe, matchesToAcknowledge, backfillsToDelete)
-		}
+	for i := 0; i < 50; i++ {
+		go runAssignments(be, matchesForAssignment, ticketsForDeletion)
+		go runDeletions(fe, ticketsForDeletion)
 	}

 	// Don't go faster than this, as it likely means that FetchMatches is throwing
@ -108,29 +94,32 @@ func run(cfg config.View) {
 	for range time.Tick(time.Millisecond * 250) {
 		// Keep pulling matches from Open Match backend
 		profiles := activeScenario.Profiles()
+		statProcessor.SetStat("TotalProfiles", len(profiles))
 		var wg sync.WaitGroup

 		for _, p := range profiles {
 			wg.Add(1)
 			go func(wg *sync.WaitGroup, p *pb.MatchProfile) {
 				defer wg.Done()
-				runFetchMatches(be, p, matchesToAssign, matchesToAcknowledge)
+				runFetchMatches(be, p, matchesForAssignment)
 			}(&wg, p)
 		}

 		// Wait for all profiles to complete before proceeding.
 		wg.Wait()
+		statProcessor.SetStat("TimeElapsed", time.Since(startTime).String())
 		telemetry.RecordUnitMeasurement(context.Background(), mIterations)
+		statProcessor.Log(w)
 	}
 }

-func runFetchMatches(be pb.BackendServiceClient, p *pb.MatchProfile, matchesToAssign chan<- *pb.Match, matchesToAcknowledge chan<- *pb.Match) {
+func runFetchMatches(be pb.BackendServiceClient, p *pb.MatchProfile, matchesForAssignment chan<- *pb.Match) {
 	ctx, span := trace.StartSpan(context.Background(), "scale.backend/FetchMatches")
 	defer span.End()

 	req := &pb.FetchMatchesRequest{
 		Config: &pb.FunctionConfig{
-			Host: "open-match-function",
+			Host: "om-function",
 			Port: 50502,
 			Type: pb.FunctionConfig_GRPC,
 		},
@ -141,7 +130,7 @@ func runFetchMatches(be pb.BackendServiceClient, p *pb.MatchProfile, matchesToAs
 	stream, err := be.FetchMatches(ctx, req)
 	if err != nil {
 		telemetry.RecordUnitMeasurement(ctx, mFetchMatchErrors)
-		logger.WithError(err).Error("failed to get available stream client")
+		statProcessor.RecordError("failed to get available stream client", err)
 		return
 	}

@ -155,97 +144,68 @@ func runFetchMatches(be pb.BackendServiceClient, p *pb.MatchProfile, matchesToAs

 		if err != nil {
 			telemetry.RecordUnitMeasurement(ctx, mFetchMatchErrors)
-			logger.WithError(err).Error("failed to get matches from stream client")
+			statProcessor.RecordError("failed to get matches from stream client", err)
 			return
 		}

 		telemetry.RecordNUnitMeasurement(ctx, mSumTicketsReturned, int64(len(resp.GetMatch().Tickets)))
 		telemetry.RecordUnitMeasurement(ctx, mMatchesReturned)
+		statProcessor.IncrementStat("MatchCount", 1)

-		if activeScenario.BackendAssignsTickets {
-			matchesToAssign <- resp.GetMatch()
-		}
-
-		if activeScenario.BackendAcknowledgesBackfills {
-			matchesToAcknowledge <- resp.GetMatch()
-		}
+		matchesForAssignment <- resp.GetMatch()
 	}
 }

-func runDeleteBackfills(fe pb.FrontendServiceClient, backfillsToDelete <-chan *pb.Backfill) {
-	for b := range backfillsToDelete {
-		if !activeScenario.BackfillDeleteCond(b) {
-			continue
-		}
-
-		ctx := context.Background()
-		_, err := fe.DeleteBackfill(ctx, &pb.DeleteBackfillRequest{BackfillId: b.Id})
-		if err != nil {
-			logger.WithError(err).Errorf("failed to delete backfill: %s", b.Id)
-			telemetry.RecordUnitMeasurement(ctx, mBackfillDeletesFailed)
-		} else {
-			telemetry.RecordUnitMeasurement(ctx, mBackfillsDeleted)
-		}
-	}
-}
-
-func runAcknowledgeBackfills(fe pb.FrontendServiceClient, matchesToAcknowledge <-chan *pb.Match, backfillsToDelete chan<- *pb.Backfill) {
-	for m := range matchesToAcknowledge {
-		backfillId := m.Backfill.GetId()
-		if backfillId == "" {
-			continue
-		}
-
-		err := acknowledgeBackfill(fe, backfillId)
-		if err != nil {
-			logger.WithError(err).Errorf("failed to acknowledge backfill: %s", backfillId)
-			continue
-		}
-
-		if activeScenario.BackendDeletesBackfills {
-			backfillsToDelete <- m.Backfill
-		}
-	}
-}
-
-func acknowledgeBackfill(fe pb.FrontendServiceClient, backfillId string) error {
-	ctx, span := trace.StartSpan(context.Background(), "scale.frontend/AcknowledgeBackfill")
-	defer span.End()
-
-	_, err := fe.AcknowledgeBackfill(ctx, &pb.AcknowledgeBackfillRequest{
-		BackfillId: backfillId,
-		Assignment: &pb.Assignment{
-			Connection: fmt.Sprintf("%d.%d.%d.%d:2222", rand.Intn(256), rand.Intn(256), rand.Intn(256), rand.Intn(256)),
-		},
-	})
-	return err
-}
-
-func runAssignments(be pb.BackendServiceClient, matchesToAssign <-chan *pb.Match) {
+func runAssignments(be pb.BackendServiceClient, matchesForAssignment <-chan *pb.Match, ticketsForDeletion chan<- string) {
 	ctx := context.Background()

-	for m := range matchesToAssign {
+	for m := range matchesForAssignment {
 		ids := []string{}
 		for _, t := range m.Tickets {
 			ids = append(ids, t.GetId())
 		}

-		_, err := be.AssignTickets(context.Background(), &pb.AssignTicketsRequest{
-			Assignments: []*pb.AssignmentGroup{
-				{
-					TicketIds: ids,
-					Assignment: &pb.Assignment{
-						Connection: fmt.Sprintf("%d.%d.%d.%d:2222", rand.Intn(256), rand.Intn(256), rand.Intn(256), rand.Intn(256)),
-					},
+		if activeScenario.BackendAssignsTickets {
+			_, err := be.AssignTickets(context.Background(), &pb.AssignTicketsRequest{
+				TicketIds: ids,
+				Assignment: &pb.Assignment{
+					Connection: fmt.Sprintf("%d.%d.%d.%d:2222", rand.Intn(256), rand.Intn(256), rand.Intn(256), rand.Intn(256)),
 				},
-			},
-		})
-		if err != nil {
-			telemetry.RecordUnitMeasurement(ctx, mMatchAssignsFailed)
-			logger.WithError(err).Error("failed to assign tickets")
-			continue
+			})
+			if err != nil {
+				telemetry.RecordUnitMeasurement(ctx, mMatchAssignsFailed)
+				statProcessor.RecordError("failed to assign tickets", err)
+				continue
+			}
+
+			telemetry.RecordUnitMeasurement(ctx, mMatchesAssigned)
+			statProcessor.IncrementStat("Assigned", len(ids))
 		}

-		telemetry.RecordUnitMeasurement(ctx, mMatchesAssigned)
+		for _, id := range ids {
+			ticketsForDeletion <- id
+		}
+	}
+}
+
+func runDeletions(fe pb.FrontendServiceClient, ticketsForDeletion <-chan string) {
+	ctx := context.Background()
+
+	for id := range ticketsForDeletion {
+		if activeScenario.BackendDeletesTickets {
+			req := &pb.DeleteTicketRequest{
+				TicketId: id,
+			}
+
+			_, err := fe.DeleteTicket(context.Background(), req)
+
+			if err == nil {
+				telemetry.RecordUnitMeasurement(ctx, mTicketsDeleted)
+				statProcessor.IncrementStat("Deleted", 1)
+			} else {
+				telemetry.RecordUnitMeasurement(ctx, mTicketDeletesFailed)
+				statProcessor.RecordError("failed to delete tickets", err)
+			}
+		}
 	}
 }
--- a/examples/scale/frontend/frontend.go
+++ b/examples/scale/frontend/frontend.go
@ -16,15 +16,13 @@ package frontend

 import (
 	"context"
-	"math/rand"
 	"sync"
+	"sync/atomic"
 	"time"

 	"github.com/sirupsen/logrus"
-	"go.opencensus.io/stats"
 	"go.opencensus.io/trace"
 	"open-match.dev/open-match/examples/scale/scenarios"
-	"open-match.dev/open-match/internal/appmain"
 	"open-match.dev/open-match/internal/config"
 	"open-match.dev/open-match/internal/rpc"
 	"open-match.dev/open-match/internal/telemetry"
@ -36,28 +34,20 @@ var (
 		"app":       "openmatch",
 		"component": "scale.frontend",
 	})
-	activeScenario = scenarios.ActiveScenario
+	activeScenario     = scenarios.ActiveScenario
+	statProcessor      = scenarios.NewStatProcessor()
+	numOfRoutineCreate = 8

-	mTicketsCreated          = telemetry.Counter("scale_frontend_tickets_created", "tickets created")
-	mTicketCreationsFailed   = telemetry.Counter("scale_frontend_ticket_creations_failed", "tickets created")
-	mRunnersWaiting          = concurrentGauge(telemetry.Gauge("scale_frontend_runners_waiting", "runners waiting"))
-	mRunnersCreating         = concurrentGauge(telemetry.Gauge("scale_frontend_runners_creating", "runners creating"))
-	mTicketsDeleted          = telemetry.Counter("scale_frontend_tickets_deleted", "tickets deleted")
-	mTicketDeletesFailed     = telemetry.Counter("scale_frontend_ticket_deletes_failed", "ticket deletes failed")
-	mBackfillsCreated        = telemetry.Counter("scale_frontend_backfills_created", "backfills_created")
-	mBackfillCreationsFailed = telemetry.Counter("scale_frontend_backfill_creations_failed", "backfill creations failed")
-	mTicketsTimeToAssignment = telemetry.HistogramWithBounds("scale_frontend_tickets_time_to_assignment", "tickets time to assignment", stats.UnitMilliseconds, []float64{0.01, 0.05, 0.1, 0.3, 0.6, 0.8, 1, 2, 3, 4, 5, 6, 8, 10, 13, 16, 20, 25, 30, 40, 50, 65, 80, 100, 130, 160, 200, 250, 300, 400, 500, 650, 800, 1000, 2000, 5000, 10000, 20000, 50000, 100000, 200000, 500000, 1000000})
+	totalCreated uint32
+
+	mTicketsCreated        = telemetry.Counter("scale_frontend_tickets_created", "tickets created")
+	mTicketCreationsFailed = telemetry.Counter("scale_frontend_ticket_creations_failed", "tickets created")
 )

-type ticketToWatch struct {
-	id        string
-	createdAt time.Time
-}
-
 // Run triggers execution of the scale frontend component that creates
 // tickets at scale in Open Match.
-func BindService(p *appmain.Params, b *appmain.Bindings) error {
-	go run(p.Config())
+func BindService(p *rpc.ServerParams, cfg config.View) error {
+	go run(cfg)

 	return nil
 }
@ -71,171 +61,75 @@ func run(cfg config.View) {
 	}
 	fe := pb.NewFrontendServiceClient(conn)

-	if activeScenario.FrontendCreatesBackfillsOnStart {
-		createBackfills(fe, activeScenario.FrontendTotalBackfillsToCreate)
-	}
+	w := logger.Writer()
+	defer w.Close()

 	ticketQPS := int(activeScenario.FrontendTicketCreatedQPS)
 	ticketTotal := activeScenario.FrontendTotalTicketsToCreate
-	totalCreated := 0

-	for range time.Tick(time.Second) {
-		for i := 0; i < ticketQPS; i++ {
-			if ticketTotal == -1 || totalCreated < ticketTotal {
-				go runner(fe)
+	for {
+		currentCreated := int(atomic.LoadUint32(&totalCreated))
+		if ticketTotal != -1 && currentCreated >= ticketTotal {
+			break
+		}
+
+		// Each inner loop creates TicketCreatedQPS tickets
+		var ticketPerRoutine, ticketModRoutine int
+		start := time.Now()
+
+		if ticketTotal == -1 || currentCreated+ticketQPS <= ticketTotal {
+			ticketPerRoutine = ticketQPS / numOfRoutineCreate
+			ticketModRoutine = ticketQPS % numOfRoutineCreate
+		} else {
+			ticketPerRoutine = (ticketTotal - currentCreated) / numOfRoutineCreate
+			ticketModRoutine = (ticketTotal - currentCreated) % numOfRoutineCreate
+		}
+
+		var wg sync.WaitGroup
+		for i := 0; i < numOfRoutineCreate; i++ {
+			wg.Add(1)
+			if i < ticketModRoutine {
+				go createPerCycle(&wg, fe, ticketPerRoutine+1, start)
+			} else {
+				go createPerCycle(&wg, fe, ticketPerRoutine, start)
 			}
 		}
+
+		// Wait for all concurrent creates to complete.
+		wg.Wait()
+		statProcessor.SetStat("TotalCreated", atomic.LoadUint32(&totalCreated))
+		statProcessor.Log(w)
 	}
 }

-func runner(fe pb.FrontendServiceClient) {
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
+func createPerCycle(wg *sync.WaitGroup, fe pb.FrontendServiceClient, ticketPerRoutine int, start time.Time) {
+	defer wg.Done()
+	cycleCreated := 0

-	g := stateGauge{}
-	defer g.stop()
-
-	g.start(mRunnersWaiting)
-	// A random sleep at the start of the worker evens calls out over the second
-	// period, and makes timing between ticket creation calls a more realistic
-	// poisson distribution.
-	time.Sleep(time.Duration(rand.Int63n(int64(time.Second))))
-
-	g.start(mRunnersCreating)
-	createdAt := time.Now()
-	id, err := createTicket(ctx, fe)
-	if err != nil {
-		logger.WithError(err).Error("failed to create a ticket")
-		return
-	}
-
-	err = watchAssignments(ctx, fe, ticketToWatch{id: id, createdAt: createdAt})
-	if err != nil {
-		logger.WithError(err).Errorf("failed to get ticket assignment: %s", id)
-	} else {
-		ms := time.Since(createdAt).Nanoseconds() / 1e6
-		stats.Record(ctx, mTicketsTimeToAssignment.M(ms))
-	}
-
-	if activeScenario.FrontendDeletesTickets {
-		err = deleteTicket(ctx, fe, id)
-		if err != nil {
-			logger.WithError(err).Errorf("failed to delete ticket: %s", id)
-		}
-	}
-}
-
-func createTicket(ctx context.Context, fe pb.FrontendServiceClient) (string, error) {
-	ctx, span := trace.StartSpan(ctx, "scale.frontend/CreateTicket")
-	defer span.End()
-
-	req := &pb.CreateTicketRequest{
-		Ticket: activeScenario.Ticket(),
-	}
-
-	resp, err := fe.CreateTicket(ctx, req)
-	if err != nil {
-		telemetry.RecordUnitMeasurement(ctx, mTicketCreationsFailed)
-		return "", err
-	}
-
-	telemetry.RecordUnitMeasurement(ctx, mTicketsCreated)
-	return resp.Id, nil
-}
-
-func watchAssignments(ctx context.Context, fe pb.FrontendServiceClient, ticket ticketToWatch) error {
-	ctx, cancel := context.WithCancel(ctx)
-	defer cancel()
-	stream, err := fe.WatchAssignments(ctx, &pb.WatchAssignmentsRequest{TicketId: ticket.id})
-	if err != nil {
-		return err
-	}
-
-	var a *pb.Assignment
-	for a.GetConnection() == "" {
-		resp, err := stream.Recv()
-		if err != nil {
-			return err
+	for j := 0; j < ticketPerRoutine; j++ {
+		req := &pb.CreateTicketRequest{
+			Ticket: activeScenario.Ticket(),
 		}

-		a = resp.Assignment
-	}
+		ctx, span := trace.StartSpan(context.Background(), "scale.frontend/CreateTicket")
+		defer span.End()

-	return nil
-}
+		timeLeft := start.Add(time.Second).Sub(time.Now())
+		if timeLeft <= 0 {
+			break
+		}
+		ticketsLeft := ticketPerRoutine - cycleCreated

-func createBackfills(fe pb.FrontendServiceClient, numBackfillsToCreate int) error {
-	for i := 0; i < numBackfillsToCreate; i++ {
-		err := createBackfill(fe)
-		if err != nil {
-			return err
+		time.Sleep(timeLeft / time.Duration(ticketsLeft))
+
+		if _, err := fe.CreateTicket(ctx, req); err == nil {
+			cycleCreated++
+			telemetry.RecordUnitMeasurement(ctx, mTicketsCreated)
+		} else {
+			statProcessor.RecordError("failed to create a ticket", err)
+			telemetry.RecordUnitMeasurement(ctx, mTicketCreationsFailed)
 		}
 	}

-	return nil
-}
-
-func createBackfill(fe pb.FrontendServiceClient) error {
-	ctx, span := trace.StartSpan(context.Background(), "scale.frontend/CreateBackfill")
-	defer span.End()
-
-	req := pb.CreateBackfillRequest{
-		Backfill: activeScenario.Backfill(),
-	}
-
-	_, err := fe.CreateBackfill(ctx, &req)
-	if err != nil {
-		telemetry.RecordUnitMeasurement(ctx, mBackfillCreationsFailed)
-		logger.WithError(err).Error("failed to create backfill")
-		return err
-	}
-
-	telemetry.RecordUnitMeasurement(ctx, mBackfillsCreated)
-	return nil
-}
-
-func deleteTicket(ctx context.Context, fe pb.FrontendServiceClient, ticketId string) error {
-	_, err := fe.DeleteTicket(ctx, &pb.DeleteTicketRequest{TicketId: ticketId})
-	if err != nil {
-		telemetry.RecordUnitMeasurement(ctx, mTicketDeletesFailed)
-	} else {
-		telemetry.RecordUnitMeasurement(ctx, mTicketsDeleted)
-	}
-
-	return err
-}
-
-// Allows concurrent moficiation of a gauge value by modifying the concurrent
-// value with a delta.
-func concurrentGauge(s *stats.Int64Measure) func(delta int64) {
-	m := sync.Mutex{}
-	v := int64(0)
-	return func(delta int64) {
-		m.Lock()
-		defer m.Unlock()
-
-		v += delta
-		telemetry.SetGauge(context.Background(), s, v)
-	}
-}
-
-// stateGauge will have a single value be applied to one gauge at a time.
-type stateGauge struct {
-	f func(int64)
-}
-
-// start begins a stage measured in a gauge, stopping any previously started
-// stage.
-func (g *stateGauge) start(f func(int64)) {
-	g.stop()
-	g.f = f
-	f(1)
-}
-
-// stop finishes the current stage by decrementing the gauge.
-func (g *stateGauge) stop() {
-	if g.f != nil {
-		g.f(-1)
-		g.f = nil
-	}
+	atomic.AddUint32(&totalCreated, uint32(cycleCreated))
 }
--- a/examples/scale/mmf/mmf.go
+++ b/examples/scale/mmf/mmf.go
@ -39,7 +39,7 @@ var (
 func Run() {
 	activeScenario := scenarios.ActiveScenario

-	conn, err := grpc.Dial("open-match-query.open-match.svc.cluster.local:50503", utilTesting.NewGRPCDialOptions(logger)...)
+	conn, err := grpc.Dial("om-query.open-match.svc.cluster.local:50503", utilTesting.NewGRPCDialOptions(logger)...)
 	if err != nil {
 		logger.Fatalf("Failed to connect to Open Match, got %v", err)
 	}
--- a/examples/scale/scenarios/backfill/backfill.go
+++ b/examples/scale/scenarios/backfill/backfill.go
@ -1,271 +0,0 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package backfill
-
-import (
-	"fmt"
-	"io"
-	"time"
-
-	"github.com/golang/protobuf/ptypes"
-	"github.com/golang/protobuf/ptypes/any"
-	"github.com/golang/protobuf/ptypes/wrappers"
-	"open-match.dev/open-match/pkg/pb"
-)
-
-const (
-	poolName     = "all"
-	openSlotsKey = "open-slots"
-)
-
-func Scenario() *BackfillScenario {
-	ticketsPerMatch := 4
-	return &BackfillScenario{
-		TicketsPerMatch:           ticketsPerMatch,
-		MaxTicketsPerNotFullMatch: 3,
-		BackfillDeleteCond: func(b *pb.Backfill) bool {
-			openSlots := getOpenSlots(b, ticketsPerMatch)
-			return openSlots <= 0
-		},
-	}
-}
-
-type BackfillScenario struct {
-	TicketsPerMatch           int
-	MaxTicketsPerNotFullMatch int
-	BackfillDeleteCond        func(*pb.Backfill) bool
-}
-
-func (s *BackfillScenario) Profiles() []*pb.MatchProfile {
-	return []*pb.MatchProfile{
-		{
-			Name: "entirePool",
-			Pools: []*pb.Pool{
-				{
-					Name: poolName,
-				},
-			},
-		},
-	}
-}
-
-func (s *BackfillScenario) Ticket() *pb.Ticket {
-	return &pb.Ticket{}
-}
-
-func (s *BackfillScenario) Backfill() *pb.Backfill {
-	return &pb.Backfill{}
-}
-
-func (s *BackfillScenario) MatchFunction(p *pb.MatchProfile, poolBackfills map[string][]*pb.Backfill, poolTickets map[string][]*pb.Ticket) ([]*pb.Match, error) {
-	return statefullMMF(p, poolBackfills, poolTickets, s.TicketsPerMatch, s.MaxTicketsPerNotFullMatch)
-}
-
-// statefullMMF is a MMF implementation which is used in scenario when we want MMF to create not full match and fill it later.
-// 1. The first FetchMatches is called
-// 2. MMF grabs maxTicketsPerNotFullMatch tickets and makes a match and new backfill for it
-// 3. MMF sets backfill's open slots to ticketsPerMatch - maxTicketsPerNotFullMatch
-// 4. MMF returns the match as a result
-// 5. The second FetchMatches is called
-// 6. MMF gets previously created backfill
-// 7. MMF gets backfill's open slots value
-// 8. MMF grabs openSlots tickets and makes a match with previously created backfill
-// 9. MMF sets backfill's open slots to 0
-// 10. MMF returns the match as a result
-func statefullMMF(p *pb.MatchProfile, poolBackfills map[string][]*pb.Backfill, poolTickets map[string][]*pb.Ticket, ticketsPerMatch int, maxTicketsPerNotFullMatch int) ([]*pb.Match, error) {
-	var matches []*pb.Match
-
-	for pool, backfills := range poolBackfills {
-		tickets, ok := poolTickets[pool]
-
-		if !ok || len(tickets) == 0 {
-			// no tickets in pool
-			continue
-		}
-
-		// process backfills first
-		for _, b := range backfills {
-			l := len(tickets)
-			if l == 0 {
-				// no tickets left
-				break
-			}
-
-			openSlots := getOpenSlots(b, ticketsPerMatch)
-			if openSlots <= 0 {
-				// no free open slots
-				continue
-			}
-
-			if l > openSlots {
-				l = openSlots
-			}
-
-			setOpenSlots(b, openSlots-l)
-			matches = append(matches, &pb.Match{
-				MatchId:       fmt.Sprintf("profile-%v-time-%v-%v", p.GetName(), time.Now().Format("2006-01-02T15:04:05.00"), len(matches)),
-				Tickets:       tickets[0:l],
-				MatchProfile:  p.GetName(),
-				MatchFunction: "backfill",
-				Backfill:      b,
-			})
-			tickets = tickets[l:]
-		}
-
-		// create not full matches with backfill
-		for {
-			l := len(tickets)
-			if l == 0 {
-				// no tickets left
-				break
-			}
-
-			if l > maxTicketsPerNotFullMatch {
-				l = maxTicketsPerNotFullMatch
-			}
-			b := pb.Backfill{}
-			setOpenSlots(&b, ticketsPerMatch-l)
-			matches = append(matches, &pb.Match{
-				MatchId:            fmt.Sprintf("profile-%v-time-%v-%v", p.GetName(), time.Now().Format("2006-01-02T15:04:05.00"), len(matches)),
-				Tickets:            tickets[0:l],
-				MatchProfile:       p.GetName(),
-				MatchFunction:      "backfill",
-				Backfill:           &b,
-				AllocateGameserver: true,
-			})
-			tickets = tickets[l:]
-		}
-	}
-
-	return matches, nil
-}
-
-func getOpenSlots(b *pb.Backfill, defaultVal int) int {
-	if b.Extensions == nil {
-		return defaultVal
-	}
-
-	any, ok := b.Extensions[openSlotsKey]
-	if !ok {
-		return defaultVal
-	}
-
-	var val wrappers.Int32Value
-	err := ptypes.UnmarshalAny(any, &val)
-	if err != nil {
-		panic(err)
-	}
-
-	return int(val.Value)
-}
-
-func setOpenSlots(b *pb.Backfill, val int) {
-	if b.Extensions == nil {
-		b.Extensions = make(map[string]*any.Any)
-	}
-
-	any, err := ptypes.MarshalAny(&wrappers.Int32Value{Value: int32(val)})
-	if err != nil {
-		panic(err)
-	}
-
-	b.Extensions[openSlotsKey] = any
-}
-
-// statelessMMF is a MMF implementation which is used in scenario when we want MMF to fill backfills created by a Gameserver. It doesn't create
-// or update any backfill.
-// 1. FetchMatches is called
-// 2. MMF gets a backfill
-// 3. MMF grabs ticketsPerMatch tickets and makes a match with the backfill
-// 4. MMF returns the match as a result
-func statelessMMF(p *pb.MatchProfile, poolBackfills map[string][]*pb.Backfill, poolTickets map[string][]*pb.Ticket, ticketsPerMatch int) ([]*pb.Match, error) {
-	var matches []*pb.Match
-
-	for pool, backfills := range poolBackfills {
-		tickets, ok := poolTickets[pool]
-
-		if !ok || len(tickets) == 0 {
-			// no tickets in pool
-			continue
-		}
-
-		for _, b := range backfills {
-			l := len(tickets)
-			if l == 0 {
-				// no tickets left
-				break
-			}
-
-			if l > ticketsPerMatch && ticketsPerMatch > 0 {
-				l = ticketsPerMatch
-			}
-
-			matches = append(matches, &pb.Match{
-				MatchId:       fmt.Sprintf("profile-%v-time-%v-%v", p.GetName(), time.Now().Format("2006-01-02T15:04:05.00"), len(matches)),
-				Tickets:       tickets[0:l],
-				MatchProfile:  p.GetName(),
-				MatchFunction: "backfill",
-				Backfill:      b,
-			})
-			tickets = tickets[l:]
-		}
-	}
-
-	return matches, nil
-}
-
-func (s *BackfillScenario) Evaluate(stream pb.Evaluator_EvaluateServer) error {
-	tickets := map[string]struct{}{}
-	backfills := map[string]struct{}{}
-	matchIds := []string{}
-
-outer:
-	for {
-		req, err := stream.Recv()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			return fmt.Errorf("failed to read evaluator input stream: %w", err)
-		}
-
-		m := req.GetMatch()
-
-		if _, ok := backfills[m.Backfill.Id]; ok {
-			continue outer
-		}
-
-		for _, t := range m.Tickets {
-			if _, ok := tickets[t.Id]; ok {
-				continue outer
-			}
-		}
-
-		for _, t := range m.Tickets {
-			tickets[t.Id] = struct{}{}
-		}
-
-		matchIds = append(matchIds, m.GetMatchId())
-	}
-
-	for _, id := range matchIds {
-		err := stream.Send(&pb.EvaluateResponse{MatchId: id})
-		if err != nil {
-			return fmt.Errorf("failed to sending evaluator output stream: %w", err)
-		}
-	}
-
-	return nil
-}
--- a/examples/scale/scenarios/battle_royal_scenario.go
+++ b/examples/scale/scenarios/battle_royal_scenario.go
@ -0,0 +1,85 @@
+package scenarios
+
+import (
+	"fmt"
+	"math/rand"
+	"time"
+
+	"open-match.dev/open-match/pkg/pb"
+)
+
+const (
+	battleRoyalRegions = 20
+	regionArg          = "region"
+)
+
+var (
+	battleRoyalScenario = &Scenario{
+		MMF:                          queryPoolsWrapper(battleRoyalMmf),
+		Evaluator:                    fifoEvaluate,
+		FrontendTotalTicketsToCreate: -1,
+		FrontendTicketCreatedQPS:     100,
+		BackendAssignsTickets:        true,
+		BackendDeletesTickets:        true,
+		Ticket:                       battleRoyalTicket,
+		Profiles:                     battleRoyalProfile,
+	}
+)
+
+func battleRoyalProfile() []*pb.MatchProfile {
+	p := []*pb.MatchProfile{}
+
+	for i := 0; i < battleRoyalRegions; i++ {
+		p = append(p, &pb.MatchProfile{
+			Name: battleRoyalRegionName(i),
+			Pools: []*pb.Pool{
+				{
+					Name: poolName,
+					StringEqualsFilters: []*pb.StringEqualsFilter{
+						{
+							StringArg: regionArg,
+							Value:     battleRoyalRegionName(i),
+						},
+					},
+				},
+			},
+		})
+	}
+	return p
+}
+
+func battleRoyalTicket() *pb.Ticket {
+	// Simple way to give an uneven distribution of region population.
+	a := rand.Intn(battleRoyalRegions) + 1
+	r := rand.Intn(a)
+
+	return &pb.Ticket{
+		SearchFields: &pb.SearchFields{
+			StringArgs: map[string]string{
+				regionArg: battleRoyalRegionName(r),
+			},
+		},
+	}
+}
+
+func battleRoyalMmf(p *pb.MatchProfile, poolTickets map[string][]*pb.Ticket) ([]*pb.Match, error) {
+	const playersInMatch = 100
+
+	tickets := poolTickets[poolName]
+	var matches []*pb.Match
+
+	for i := 0; i+playersInMatch <= len(tickets); i += playersInMatch {
+		matches = append(matches, &pb.Match{
+			MatchId:       fmt.Sprintf("profile-%v-time-%v-%v", p.GetName(), time.Now().Format("2006-01-02T15:04:05.00"), len(matches)),
+			Tickets:       tickets[i : i+playersInMatch],
+			MatchProfile:  p.GetName(),
+			MatchFunction: "battleRoyal",
+		})
+	}
+
+	return matches, nil
+}
+
+func battleRoyalRegionName(i int) string {
+	return fmt.Sprintf("region_%d", i)
+}
--- a/examples/scale/scenarios/battleroyal/battleroyal.go
+++ b/examples/scale/scenarios/battleroyal/battleroyal.go
@ -1,145 +0,0 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package battleroyal
-
-import (
-	"fmt"
-	"io"
-	"math/rand"
-	"time"
-
-	"open-match.dev/open-match/pkg/pb"
-)
-
-const (
-	poolName  = "all"
-	regionArg = "region"
-)
-
-func battleRoyalRegionName(i int) string {
-	return fmt.Sprintf("region_%d", i)
-}
-
-func Scenario() *BattleRoyalScenario {
-	return &BattleRoyalScenario{
-		regions: 20,
-	}
-}
-
-type BattleRoyalScenario struct {
-	regions int
-}
-
-func (b *BattleRoyalScenario) Profiles() []*pb.MatchProfile {
-	p := []*pb.MatchProfile{}
-
-	for i := 0; i < b.regions; i++ {
-		p = append(p, &pb.MatchProfile{
-			Name: battleRoyalRegionName(i),
-			Pools: []*pb.Pool{
-				{
-					Name: poolName,
-					StringEqualsFilters: []*pb.StringEqualsFilter{
-						{
-							StringArg: regionArg,
-							Value:     battleRoyalRegionName(i),
-						},
-					},
-				},
-			},
-		})
-	}
-	return p
-}
-
-func (b *BattleRoyalScenario) Ticket() *pb.Ticket {
-	// Simple way to give an uneven distribution of region population.
-	a := rand.Intn(b.regions) + 1
-	r := rand.Intn(a)
-
-	return &pb.Ticket{
-		SearchFields: &pb.SearchFields{
-			StringArgs: map[string]string{
-				regionArg: battleRoyalRegionName(r),
-			},
-		},
-	}
-}
-
-func (b *BattleRoyalScenario) Backfill() *pb.Backfill {
-	return nil
-}
-
-func (b *BattleRoyalScenario) MatchFunction(p *pb.MatchProfile, poolBackfills map[string][]*pb.Backfill, poolTickets map[string][]*pb.Ticket) ([]*pb.Match, error) {
-	const playersInMatch = 100
-
-	tickets := poolTickets[poolName]
-	var matches []*pb.Match
-
-	for i := 0; i+playersInMatch <= len(tickets); i += playersInMatch {
-		matches = append(matches, &pb.Match{
-			MatchId:       fmt.Sprintf("profile-%v-time-%v-%v", p.GetName(), time.Now().Format("2006-01-02T15:04:05.00"), len(matches)),
-			Tickets:       tickets[i : i+playersInMatch],
-			MatchProfile:  p.GetName(),
-			MatchFunction: "battleRoyal",
-		})
-	}
-
-	return matches, nil
-}
-
-// fifoEvaluate accepts all matches which don't contain the same ticket as in a
-// previously accepted match.  Essentially first to claim the ticket wins.
-func (b *BattleRoyalScenario) Evaluate(stream pb.Evaluator_EvaluateServer) error {
-	used := map[string]struct{}{}
-
-	// TODO: once the evaluator client supports sending and receiving at the
-	// same time, don't buffer, just send results immediately.
-	matchIDs := []string{}
-
-outer:
-	for {
-		req, err := stream.Recv()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			return fmt.Errorf("Error reading evaluator input stream: %w", err)
-		}
-
-		m := req.GetMatch()
-
-		for _, t := range m.Tickets {
-			if _, ok := used[t.Id]; ok {
-				continue outer
-			}
-		}
-
-		for _, t := range m.Tickets {
-			used[t.Id] = struct{}{}
-		}
-
-		matchIDs = append(matchIDs, m.GetMatchId())
-	}
-
-	for _, mID := range matchIDs {
-		err := stream.Send(&pb.EvaluateResponse{MatchId: mID})
-		if err != nil {
-			return fmt.Errorf("Error sending evaluator output stream: %w", err)
-		}
-	}
-
-	return nil
-}
--- a/examples/scale/scenarios/firstmatch/firstmatch.go
+++ b/examples/scale/scenarios/firstmatch/firstmatch.go
@ -1,18 +1,4 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package firstmatch
+package scenarios

 import (
 	"fmt"
@ -26,14 +12,20 @@ const (
 	poolName = "all"
 )

-func Scenario() *FirstMatchScenario {
-	return &FirstMatchScenario{}
-}
+var (
+	firstMatchScenario = &Scenario{
+		MMF:                          queryPoolsWrapper(firstMatchMmf),
+		Evaluator:                    fifoEvaluate,
+		FrontendTotalTicketsToCreate: -1,
+		FrontendTicketCreatedQPS:     100,
+		BackendAssignsTickets:        true,
+		BackendDeletesTickets:        true,
+		Ticket:                       firstMatchTicket,
+		Profiles:                     firstMatchProfile,
+	}
+)

-type FirstMatchScenario struct {
-}
-
-func (*FirstMatchScenario) Profiles() []*pb.MatchProfile {
+func firstMatchProfile() []*pb.MatchProfile {
 	return []*pb.MatchProfile{
 		{
 			Name: "entirePool",
@ -46,15 +38,11 @@ func (*FirstMatchScenario) Profiles() []*pb.MatchProfile {
 	}
 }

-func (*FirstMatchScenario) Ticket() *pb.Ticket {
+func firstMatchTicket() *pb.Ticket {
 	return &pb.Ticket{}
 }

-func (*FirstMatchScenario) Backfill() *pb.Backfill {
-	return nil
-}
-
-func (*FirstMatchScenario) MatchFunction(p *pb.MatchProfile, poolBackfills map[string][]*pb.Backfill, poolTickets map[string][]*pb.Ticket) ([]*pb.Match, error) {
+func firstMatchMmf(p *pb.MatchProfile, poolTickets map[string][]*pb.Ticket) ([]*pb.Match, error) {
 	tickets := poolTickets[poolName]
 	var matches []*pb.Match

@ -72,10 +60,10 @@ func (*FirstMatchScenario) MatchFunction(p *pb.MatchProfile, poolBackfills map[s

 // fifoEvaluate accepts all matches which don't contain the same ticket as in a
 // previously accepted match.  Essentially first to claim the ticket wins.
-func (*FirstMatchScenario) Evaluate(stream pb.Evaluator_EvaluateServer) error {
+func fifoEvaluate(stream pb.Evaluator_EvaluateServer) error {
 	used := map[string]struct{}{}

-	// TODO: once the evaluator client supports sending and receiving at the
+	// TODO: once the evaluator client supports sending and recieving at the
 	// same time, don't buffer, just send results immediately.
 	matchIDs := []string{}

--- a/examples/scale/scenarios/scenarios.go
+++ b/examples/scale/scenarios/scenarios.go
@ -14,75 +14,10 @@

 package scenarios

-import (
-	"sync"
-
-	"github.com/sirupsen/logrus"
-	"google.golang.org/grpc"
-	"open-match.dev/open-match/examples/scale/scenarios/backfill"
-	"open-match.dev/open-match/examples/scale/scenarios/firstmatch"
-	"open-match.dev/open-match/internal/util/testing"
-	"open-match.dev/open-match/pkg/matchfunction"
-	"open-match.dev/open-match/pkg/pb"
-)
-
-var (
-	queryServiceAddress = "open-match-query.open-match.svc.cluster.local:50503" // Address of the QueryService Endpoint.
-
-	logger = logrus.WithFields(logrus.Fields{
-		"app": "scale",
-	})
-)
-
-// GameScenario defines what tickets look like, and how they should be matched.
-type GameScenario interface {
-	// Ticket creates a new ticket, with randomized parameters.
-	Ticket() *pb.Ticket
-
-	// Backfill creates a new backfill, with randomized parameters.
-	Backfill() *pb.Backfill
-
-	// Profiles lists all of the profiles that should run.
-	Profiles() []*pb.MatchProfile
-
-	// MatchFunction is the custom logic implementation of the match function.
-	MatchFunction(p *pb.MatchProfile, poolBackfills map[string][]*pb.Backfill, poolTickets map[string][]*pb.Ticket) ([]*pb.Match, error)
-
-	// Evaluate is the custom logic implementation of the evaluator.
-	Evaluate(stream pb.Evaluator_EvaluateServer) error
-}
+import "open-match.dev/open-match/pkg/pb"

 // ActiveScenario sets the scenario with preset parameters that we want to use for current Open Match benchmark run.
-var ActiveScenario = func() *Scenario {
-	var gs GameScenario = firstmatch.Scenario()
-
-	// TODO: Select which scenario to use based on some configuration or choice,
-	// so it's easier to run different scenarios without changing code.
-	//gs = battleroyal.Scenario()
-	//gs = teamshooter.Scenario()
-	s := backfill.Scenario()
-	gs = s
-
-	return &Scenario{
-		FrontendTotalTicketsToCreate:    -1,
-		FrontendTicketCreatedQPS:        100,
-		FrontendCreatesBackfillsOnStart: true,
-		FrontendTotalBackfillsToCreate:  1000,
-		FrontendDeletesTickets:          true,
-
-		BackendAssignsTickets:        false,
-		BackendAcknowledgesBackfills: true,
-		BackendDeletesBackfills:      true,
-
-		Ticket:             gs.Ticket,
-		Backfill:           gs.Backfill,
-		BackfillDeleteCond: s.BackfillDeleteCond,
-		Profiles:           gs.Profiles,
-
-		MMF:       queryPoolsWrapper(gs.MatchFunction),
-		Evaluator: gs.Evaluate,
-	}
-}()
+var ActiveScenario = battleRoyalScenario

 // Scenario defines the controllable fields for Open Match benchmark scenarios
 type Scenario struct {
@ -97,23 +32,17 @@ type Scenario struct {
 	// TicketExtensionSize       int
 	// PendingTicketNumber       int
 	// MatchExtensionSize        int
-	FrontendTicketCreatedQPS        uint32
-	FrontendTotalTicketsToCreate    int // TotalTicketsToCreate = -1 let scale-frontend create tickets forever
-	FrontendTotalBackfillsToCreate  int
-	FrontendCreatesBackfillsOnStart bool
-	FrontendDeletesTickets          bool
+	FrontendTotalTicketsToCreate int // TotalTicketsToCreate = -1 let scale-frontend create tickets forever
+	FrontendTicketCreatedQPS     uint32

 	// GameBackend Configs
 	// ProfileNumber      int
 	// FilterNumber       int
-	BackendAssignsTickets        bool
-	BackendAcknowledgesBackfills bool
-	BackendDeletesBackfills      bool
+	BackendAssignsTickets bool
+	BackendDeletesTickets bool

-	Ticket             func() *pb.Ticket
-	Backfill           func() *pb.Backfill
-	BackfillDeleteCond func(*pb.Backfill) bool
-	Profiles           func() []*pb.MatchProfile
+	Ticket   func() *pb.Ticket
+	Profiles func() []*pb.MatchProfile

 	MMF       matchFunction
 	Evaluator evaluatorFunction
@ -129,49 +58,3 @@ func (mmf matchFunction) Run(req *pb.RunRequest, srv pb.MatchFunction_RunServer)
 func (eval evaluatorFunction) Evaluate(srv pb.Evaluator_EvaluateServer) error {
 	return eval(srv)
 }
-
-func getQueryServiceGRPCClient() pb.QueryServiceClient {
-	conn, err := grpc.Dial(queryServiceAddress, testing.NewGRPCDialOptions(logger)...)
-	if err != nil {
-		logger.Fatalf("Failed to connect to Open Match, got %v", err)
-	}
-	return pb.NewQueryServiceClient(conn)
-}
-
-func queryPoolsWrapper(mmf func(req *pb.MatchProfile, poolBackfills map[string][]*pb.Backfill, poolTickets map[string][]*pb.Ticket) ([]*pb.Match, error)) matchFunction {
-	var q pb.QueryServiceClient
-	var startQ sync.Once
-
-	return func(req *pb.RunRequest, stream pb.MatchFunction_RunServer) error {
-		startQ.Do(func() {
-			q = getQueryServiceGRPCClient()
-		})
-
-		poolTickets, err := matchfunction.QueryPools(stream.Context(), q, req.GetProfile().GetPools())
-		if err != nil {
-			return err
-		}
-
-		poolBackfills, err := matchfunction.QueryBackfillPools(stream.Context(), q, req.GetProfile().GetPools())
-		if err != nil {
-			return err
-		}
-
-		proposals, err := mmf(req.GetProfile(), poolBackfills, poolTickets)
-		if err != nil {
-			return err
-		}
-
-		logger.WithFields(logrus.Fields{
-			"proposals": proposals,
-		}).Trace("proposals returned by match function")
-
-		for _, proposal := range proposals {
-			if err := stream.Send(&pb.RunResponse{Proposal: proposal}); err != nil {
-				return err
-			}
-		}
-
-		return nil
-	}
-}
--- a/examples/scale/scenarios/teamshooter/teamshooter.go
+++ b/examples/scale/scenarios/teamshooter/teamshooter.go
@ -1,334 +0,0 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// TeamShooterScenario is a scenario which is designed to emulate the
-// approximate behavior to open match that a skill based team game would have.
-// It doesn't try to provide good matchmaking for real players. There are three
-// arguments used:
-// mode: The game mode the players wants to play in. mode is a hard partition.
-// regions: Players may have good latency to one or more regions. A player will
-//   search for matches in all eligible regions.
-// skill: Players have a random skill based on a normal distribution. Players
-//   will only be matched with other players who have a close skill value. The
-//   match functions have overlapping partitions of the skill brackets.
-package teamshooter
-
-import (
-	"fmt"
-	"io"
-	"math"
-	"math/rand"
-	"sort"
-	"time"
-
-	"github.com/golang/protobuf/ptypes"
-	"github.com/golang/protobuf/ptypes/any"
-	"github.com/golang/protobuf/ptypes/wrappers"
-	"open-match.dev/open-match/pkg/pb"
-)
-
-const (
-	poolName = "all"
-	skillArg = "skill"
-	modeArg  = "mode"
-)
-
-// TeamShooterScenario provides the required methods for running a scenario.
-type TeamShooterScenario struct {
-	// Names of available region tags.
-	regions []string
-	// Maximum regions a player can search in.
-	maxRegions int
-	// Number of tickets which form a match.
-	playersPerGame int
-	// For each pair of consequitive values, the value to split profiles on by
-	// skill.
-	skillBoundaries []float64
-	// Maximum difference between two tickets to consider a match valid.
-	maxSkillDifference float64
-	// List of mode names.
-	modes []string
-	// Returns a random mode, with some weight.
-	randomMode func() string
-}
-
-// Scenario creates a new TeamShooterScenario.
-func Scenario() *TeamShooterScenario {
-
-	modes, randomMode := weightedChoice(map[string]int{
-		"pl": 100, // Payload, very popular.
-		"cp": 25,  // Capture point, 1/4 as popular.
-	})
-
-	regions := []string{}
-	for i := 0; i < 2; i++ {
-		regions = append(regions, fmt.Sprintf("region_%d", i))
-	}
-
-	return &TeamShooterScenario{
-		regions:            regions,
-		maxRegions:         1,
-		playersPerGame:     12,
-		skillBoundaries:    []float64{math.Inf(-1), 0, math.Inf(1)},
-		maxSkillDifference: 0.01,
-		modes:              modes,
-		randomMode:         randomMode,
-	}
-}
-
-// Profiles shards the player base on mode, region, and skill.
-func (t *TeamShooterScenario) Profiles() []*pb.MatchProfile {
-	p := []*pb.MatchProfile{}
-
-	for _, region := range t.regions {
-		for _, mode := range t.modes {
-			for i := 0; i+1 < len(t.skillBoundaries); i++ {
-				skillMin := t.skillBoundaries[i] - t.maxSkillDifference/2
-				skillMax := t.skillBoundaries[i+1] + t.maxSkillDifference/2
-				p = append(p, &pb.MatchProfile{
-					Name: fmt.Sprintf("%s_%s_%v-%v", region, mode, skillMin, skillMax),
-					Pools: []*pb.Pool{
-						{
-							Name: poolName,
-							DoubleRangeFilters: []*pb.DoubleRangeFilter{
-								{
-									DoubleArg: skillArg,
-									Min:       skillMin,
-									Max:       skillMax,
-								},
-							},
-							TagPresentFilters: []*pb.TagPresentFilter{
-								{
-									Tag: region,
-								},
-							},
-							StringEqualsFilters: []*pb.StringEqualsFilter{
-								{
-									StringArg: modeArg,
-									Value:     mode,
-								},
-							},
-						},
-					},
-				})
-			}
-		}
-	}
-
-	return p
-}
-
-// Ticket creates a randomized player.
-func (t *TeamShooterScenario) Ticket() *pb.Ticket {
-	region := rand.Intn(len(t.regions))
-	numRegions := rand.Intn(t.maxRegions) + 1
-
-	tags := []string{}
-	for i := 0; i < numRegions; i++ {
-		tags = append(tags, t.regions[region])
-		// The Earth is actually a circle.
-		region = (region + 1) % len(t.regions)
-	}
-
-	return &pb.Ticket{
-		SearchFields: &pb.SearchFields{
-			DoubleArgs: map[string]float64{
-				skillArg: clamp(rand.NormFloat64(), -3, 3),
-			},
-			StringArgs: map[string]string{
-				modeArg: t.randomMode(),
-			},
-			Tags: tags,
-		},
-	}
-}
-
-func (t *TeamShooterScenario) Backfill() *pb.Backfill {
-	return nil
-}
-
-// MatchFunction puts tickets into matches based on their skill, finding the
-// required number of tickets for a game within the maximum skill difference.
-func (t *TeamShooterScenario) MatchFunction(p *pb.MatchProfile, poolBackfills map[string][]*pb.Backfill, poolTickets map[string][]*pb.Ticket) ([]*pb.Match, error) {
-	skill := func(t *pb.Ticket) float64 {
-		return t.SearchFields.DoubleArgs[skillArg]
-	}
-
-	tickets := poolTickets[poolName]
-	var matches []*pb.Match
-
-	sort.Slice(tickets, func(i, j int) bool {
-		return skill(tickets[i]) < skill(tickets[j])
-	})
-
-	for i := 0; i+t.playersPerGame <= len(tickets); i++ {
-		mt := tickets[i : i+t.playersPerGame]
-		if skill(mt[len(mt)-1])-skill(mt[0]) < t.maxSkillDifference {
-			avg := float64(0)
-			for _, t := range mt {
-				avg += skill(t)
-			}
-			avg /= float64(len(mt))
-
-			q := float64(0)
-			for _, t := range mt {
-				diff := skill(t) - avg
-				q -= diff * diff
-			}
-
-			m, err := (&matchExt{
-				id:            fmt.Sprintf("profile-%v-time-%v-%v", p.GetName(), time.Now().Format("2006-01-02T15:04:05.00"), len(matches)),
-				matchProfile:  p.GetName(),
-				matchFunction: "skillmatcher",
-				tickets:       mt,
-				quality:       q,
-			}).pack()
-			if err != nil {
-				return nil, err
-			}
-			matches = append(matches, m)
-		}
-	}
-
-	return matches, nil
-}
-
-// Evaluate returns matches in order of highest quality, skipping any matches
-// which contain tickets that are already used.
-func (t *TeamShooterScenario) Evaluate(stream pb.Evaluator_EvaluateServer) error {
-	// Unpacked proposal matches.
-	proposals := []*matchExt{}
-	// Ticket ids which are used in a match.
-	used := map[string]struct{}{}
-
-	for {
-		req, err := stream.Recv()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			return fmt.Errorf("Error reading evaluator input stream: %w", err)
-		}
-
-		p, err := unpackMatch(req.GetMatch())
-		if err != nil {
-			return err
-		}
-		proposals = append(proposals, p)
-	}
-
-	// Higher quality is better.
-	sort.Slice(proposals, func(i, j int) bool {
-		return proposals[i].quality > proposals[j].quality
-	})
-
-outer:
-	for _, p := range proposals {
-		for _, t := range p.tickets {
-			if _, ok := used[t.Id]; ok {
-				continue outer
-			}
-		}
-
-		for _, t := range p.tickets {
-			used[t.Id] = struct{}{}
-		}
-
-		err := stream.Send(&pb.EvaluateResponse{MatchId: p.id})
-		if err != nil {
-			return fmt.Errorf("Error sending evaluator output stream: %w", err)
-		}
-	}
-
-	return nil
-}
-
-// matchExt presents the match and extension data in a native form, and allows
-// easy conversion to and from proto format.
-type matchExt struct {
-	id            string
-	tickets       []*pb.Ticket
-	quality       float64
-	matchProfile  string
-	matchFunction string
-}
-
-func unpackMatch(m *pb.Match) (*matchExt, error) {
-	v := &wrappers.DoubleValue{}
-
-	err := ptypes.UnmarshalAny(m.Extensions["quality"], v)
-	if err != nil {
-		return nil, fmt.Errorf("Error unpacking match quality: %w", err)
-	}
-
-	return &matchExt{
-		id:            m.MatchId,
-		tickets:       m.Tickets,
-		quality:       v.Value,
-		matchProfile:  m.MatchProfile,
-		matchFunction: m.MatchFunction,
-	}, nil
-}
-
-func (m *matchExt) pack() (*pb.Match, error) {
-	v := &wrappers.DoubleValue{Value: m.quality}
-
-	a, err := ptypes.MarshalAny(v)
-	if err != nil {
-		return nil, fmt.Errorf("Error packing match quality: %w", err)
-	}
-
-	return &pb.Match{
-		MatchId:       m.id,
-		Tickets:       m.tickets,
-		MatchProfile:  m.matchProfile,
-		MatchFunction: m.matchFunction,
-		Extensions: map[string]*any.Any{
-			"quality": a,
-		},
-	}, nil
-}
-
-func clamp(v float64, min float64, max float64) float64 {
-	if v < min {
-		return min
-	}
-	if v > max {
-		return max
-	}
-	return v
-}
-
-// weightedChoice takes a map of values, and their relative probability.  It
-// returns a list of the values, along with a function which will return random
-// choices from the values with the weighted probability.
-func weightedChoice(m map[string]int) ([]string, func() string) {
-	s := make([]string, 0, len(m))
-	total := 0
-	for k, v := range m {
-		s = append(s, k)
-		total += v
-	}
-
-	return s, func() string {
-		remainder := rand.Intn(total)
-		for k, v := range m {
-			remainder -= v
-			if remainder < 0 {
-				return k
-			}
-		}
-		panic("weightedChoice is broken.")
-	}
-}
--- a/examples/scale/scenarios/util.go
+++ b/examples/scale/scenarios/util.go
@ -0,0 +1,137 @@
+// Copyright 2019 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package scenarios
+
+import (
+	"fmt"
+	"io"
+	"sync"
+
+	"github.com/sirupsen/logrus"
+	"google.golang.org/grpc"
+	"open-match.dev/open-match/internal/util/testing"
+	"open-match.dev/open-match/pkg/matchfunction"
+	"open-match.dev/open-match/pkg/pb"
+)
+
+var (
+	queryServiceAddress = "om-query.open-match.svc.cluster.local:50503" // Address of the QueryService Endpoint.
+
+	logger = logrus.WithFields(logrus.Fields{
+		"app": "scale",
+	})
+)
+
+// StatProcessor uses syncMaps to store the stress test metrics and occurrence of errors.
+// It can write out the data to an input io.Writer.
+type StatProcessor struct {
+	em *sync.Map
+	sm *sync.Map
+}
+
+// NewStatProcessor returns an initialized StatProcessor
+func NewStatProcessor() *StatProcessor {
+	return &StatProcessor{
+		em: &sync.Map{},
+		sm: &sync.Map{},
+	}
+}
+
+// SetStat sets the value for a key
+func (e StatProcessor) SetStat(k string, v interface{}) {
+	e.sm.Store(k, v)
+}
+
+// IncrementStat atomically increments the value of a key by delta
+func (e StatProcessor) IncrementStat(k string, delta interface{}) {
+	statRead, ok := e.sm.Load(k)
+	if !ok {
+		statRead = 0
+	}
+
+	switch delta.(type) {
+	case int:
+		e.sm.Store(k, statRead.(int)+delta.(int))
+	case float32:
+		e.sm.Store(k, statRead.(float32)+delta.(float32))
+	case float64:
+		e.sm.Store(k, statRead.(float64)+delta.(float64))
+	default:
+		logger.Errorf("IncrementStat: type %T not supported", delta)
+	}
+}
+
+// RecordError atomically records the occurrence of input errors
+func (e StatProcessor) RecordError(desc string, err error) {
+	errMsg := fmt.Sprintf("%s: %s", desc, err.Error())
+	errRead, ok := e.em.Load(errMsg)
+	if !ok {
+		errRead = 0
+	}
+	e.em.Store(errMsg, errRead.(int)+1)
+}
+
+// Log writes the formatted errors and metrics to the input writer
+func (e StatProcessor) Log(w io.Writer) {
+	e.sm.Range(func(k interface{}, v interface{}) bool {
+		w.Write([]byte(fmt.Sprintf("%s: %d \n", k, v)))
+		return true
+	})
+	e.em.Range(func(k interface{}, v interface{}) bool {
+		w.Write([]byte(fmt.Sprintf("%s: %d \n", k, v)))
+		return true
+	})
+}
+
+func getQueryServiceGRPCClient() pb.QueryServiceClient {
+	conn, err := grpc.Dial(queryServiceAddress, testing.NewGRPCDialOptions(logger)...)
+	if err != nil {
+		logger.Fatalf("Failed to connect to Open Match, got %v", err)
+	}
+	return pb.NewQueryServiceClient(conn)
+}
+
+func queryPoolsWrapper(mmf func(req *pb.MatchProfile, pools map[string][]*pb.Ticket) ([]*pb.Match, error)) matchFunction {
+	var q pb.QueryServiceClient
+	var startQ sync.Once
+
+	return func(req *pb.RunRequest, stream pb.MatchFunction_RunServer) error {
+		startQ.Do(func() {
+			q = getQueryServiceGRPCClient()
+		})
+
+		poolTickets, err := matchfunction.QueryPools(stream.Context(), q, req.GetProfile().GetPools())
+		if err != nil {
+			return err
+		}
+
+		proposals, err := mmf(req.GetProfile(), poolTickets)
+		if err != nil {
+			return err
+		}
+
+		logger.WithFields(logrus.Fields{
+			"proposals": proposals,
+		}).Trace("proposals returned by match function")
+
+		for _, proposal := range proposals {
+			if err := stream.Send(&pb.RunResponse{Proposal: proposal}); err != nil {
+				return err
+			}
+		}
+
+		return nil
+	}
+}
--- a/go.mod
+++ b/go.mod
@ -15,51 +15,57 @@ module open-match.dev/open-match
 // limitations under the License.

 // When updating Go version, update Dockerfile.ci, Dockerfile.base-build, and go.mod
-go 1.14
+go 1.13

 require (
-	contrib.go.opencensus.io/exporter/jaeger v0.2.1
-	contrib.go.opencensus.io/exporter/ocagent v0.7.0
-	contrib.go.opencensus.io/exporter/prometheus v0.2.0
-	contrib.go.opencensus.io/exporter/stackdriver v0.13.4
-	github.com/Bose/minisentinel v0.0.0-20200130220412-917c5a9223bb
+	cloud.google.com/go v0.47.0 // indirect
+	contrib.go.opencensus.io/exporter/jaeger v0.1.0
+	contrib.go.opencensus.io/exporter/ocagent v0.6.0
+	contrib.go.opencensus.io/exporter/prometheus v0.1.0
+	contrib.go.opencensus.io/exporter/stackdriver v0.12.8
 	github.com/TV4/logrus-stackdriver-formatter v0.1.0
-	github.com/alicebob/miniredis/v2 v2.14.1
-	github.com/aws/aws-sdk-go v1.35.26 // indirect
+	github.com/alicebob/miniredis/v2 v2.10.1
+	github.com/apache/thrift v0.13.0 // indirect
+	github.com/aws/aws-sdk-go v1.25.27 // indirect
 	github.com/cenkalti/backoff v2.2.1+incompatible
-	github.com/fsnotify/fsnotify v1.4.9
-	github.com/go-redsync/redsync/v4 v4.3.0
+	github.com/fsnotify/fsnotify v1.4.7
 	github.com/gogo/protobuf v1.3.1 // indirect
-	github.com/golang/protobuf v1.4.3
-	github.com/gomodule/redigo v2.0.1-0.20191111085604-09d84710e01a+incompatible
+	github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9 // indirect
+	github.com/golang/protobuf v1.3.2
+	github.com/gomodule/redigo v1.7.1-0.20190322064113-39e2c31b7ca3
 	github.com/googleapis/gnostic v0.3.1 // indirect
-	github.com/grpc-ecosystem/go-grpc-middleware v1.2.2
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.3.0
-	github.com/hashicorp/errwrap v1.1.0 // indirect
-	github.com/imdario/mergo v0.3.11 // indirect
-	github.com/pelletier/go-toml v1.8.1 // indirect
-	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.8.0
+	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
+	github.com/grpc-ecosystem/go-grpc-middleware v1.1.0
+	github.com/grpc-ecosystem/grpc-gateway v1.12.0
+	github.com/imdario/mergo v0.3.8 // indirect
+	github.com/json-iterator/go v1.1.8 // indirect
+	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
+	github.com/pelletier/go-toml v1.6.0 // indirect
+	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
+	github.com/pkg/errors v0.8.1
+	github.com/prometheus/client_golang v1.2.1
 	github.com/rs/xid v1.2.1
-	github.com/sirupsen/logrus v1.7.0
-	github.com/spf13/afero v1.4.1 // indirect
+	github.com/sirupsen/logrus v1.4.2
+	github.com/spf13/afero v1.2.1 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
-	github.com/spf13/viper v1.7.1
-	github.com/stretchr/testify v1.7.0
-	go.opencensus.io v0.23.0
-	golang.org/x/net v0.0.0-20210224082022-3d97a244fca7
-	golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
-	golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073 // indirect
-	google.golang.org/api v0.35.0 // indirect
-	google.golang.org/genproto v0.0.0-20210224155714-063164c882e6
-	google.golang.org/grpc v1.36.0
-	google.golang.org/protobuf v1.25.1-0.20201208041424-160c7477e0e8
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/spf13/viper v1.5.0
+	github.com/stretchr/testify v1.4.0
+	github.com/yuin/gopher-lua v0.0.0-20190514113301-1cd887cd7036 // indirect
+	go.opencensus.io v0.22.1
+	golang.org/x/crypto v0.0.0-20191105034135-c7e5f84aec59 // indirect
+	golang.org/x/net v0.0.0-20191105084925-a882066a44e0
+	golang.org/x/sys v0.0.0-20191105231009-c1f44814a5cd // indirect
+	golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
+	google.golang.org/api v0.13.0 // indirect
+	google.golang.org/appengine v1.6.5 // indirect
+	google.golang.org/genproto v0.0.0-20191028173616-919d9bdd9fe6
+	google.golang.org/grpc v1.25.0
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
-	k8s.io/api v0.0.0-20191004102349-159aefb8556b // kubernetes-1.14.10
-	k8s.io/apimachinery v0.0.0-20191004074956-c5d2f014d689 // kubernetes-1.14.10
-	k8s.io/client-go v11.0.1-0.20191029005444-8e4128053008+incompatible // kubernetes-1.14.10
+	gopkg.in/yaml.v2 v2.2.5 // indirect
+	k8s.io/api v0.0.0-20191004102255-dacd7df5a50b // kubernetes-1.13.12
+	k8s.io/apimachinery v0.0.0-20191004074956-01f8b7d1121a // kubernetes-1.13.12
+	k8s.io/client-go v0.0.0-20191004102537-eb5b9a8cfde7 // kubernetes-1.13.12
 	k8s.io/klog v1.0.0 // indirect
-	k8s.io/utils v0.0.0-20200729134348-d5654de09c73 // indirect
-	sigs.k8s.io/yaml v1.2.0 // indirect
+	sigs.k8s.io/yaml v1.1.0 // indirect
 )
--- a/go.sum
+++ b/go.sum
--- a/install/02-open-match-demo.yaml
+++ b/install/02-open-match-demo.yaml
@ -20,6 +20,28 @@ metadata:
    app: open-match-demo
    release: open-match-demo
 ---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: customize-configmap
+  namespace: open-match-demo
+  labels:
+    app: open-match-customize
+    component: config
+    release: open-match-demo
+data:
+  matchmaker_config_default.yaml: |-
+    api:
+      functions:
+        hostname: "om-function"
+        grpcport: 50502
+        httpport: 51502
+  matchmaker_config_override.yaml: |-
+    api:
+      query:
+        hostname: "om-query.open-match.svc.cluster.local"
+        grpcport: "50503"
+---
 kind: Service
 apiVersion: v1
 metadata:
@ -86,9 +108,21 @@ spec:
        component: matchfunction
        release: open-match-demo
    spec:
+      volumes:
+        - name: customize-config-volume
+          configMap:
+            name: customize-configmap
+        - name: om-config-volume-default
+          configMap:
+            name: customize-configmap
      containers:
      - name: om-function
-        image: "gcr.io/open-match-public-images/openmatch-mmf-go-soloduel:0.0.0-dev"
+        volumeMounts:
+          - name: customize-config-volume
+            mountPath: /app/config/override
+          - name: om-config-volume-default
+            mountPath: /app/config/default
+        image: "gcr.io/open-match-public-images/openmatch-mmf-go-soloduel:0.9.0"
        ports:
        - name: grpc
          containerPort: 50502
@ -125,7 +159,7 @@ spec:
    spec:
      containers:
      - name: om-demo
-        image: "gcr.io/open-match-public-images/openmatch-demo-first-match:0.0.0-dev"
+        image: "gcr.io/open-match-public-images/openmatch-demo-first-match:0.9.0"
        imagePullPolicy: Always
        ports:
        - name: http
--- a/install/helm/open-match/Chart.yaml
+++ b/install/helm/open-match/Chart.yaml
@ -13,13 +13,13 @@
 # limitations under the License.

 apiVersion: v2
-appVersion: "1.3.0-rc.1"
-version: 1.3.0-rc.1
+appVersion: "0.9.0"
+version: 0.9.0
 name: open-match
 dependencies:
  - name: redis
-    version: 12.3.3
-    repository: https://charts.bitnami.com/bitnami
+    version: 9.5.0
+    repository: https://kubernetes-charts.storage.googleapis.com/
    condition: open-match-core.redis.enabled
  - name: open-match-telemetry
    version: 0.0.0-dev
--- a/install/helm/open-match/subcharts/open-match-customize/templates/_helpers.tpl
+++ b/install/helm/open-match/subcharts/open-match-customize/templates/_helpers.tpl
@ -1,20 +0,0 @@
-{*
- Copyright 2019 Google LLC
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*}
-
-{{/* vim: set filetype=mustache: */}}
-{{- define "openmatchcustomize.function.hostName" -}}
-{{- .Values.function.hostName | default (printf "%s-function" (include "openmatch.fullname" . ) ) -}}
-{{- end -}}
--- a/install/helm/open-match/subcharts/open-match-customize/templates/customize-configmap.yaml
+++ b/install/helm/open-match/subcharts/open-match-customize/templates/customize-configmap.yaml
@ -0,0 +1,41 @@
+# Copyright 2019 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: customize-configmap
+  namespace: {{ .Release.Namespace }}
+  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
+  labels:
+    app: {{ template "openmatch.name" . }}
+    component: config
+    release: {{ .Release.Name }}
+data:
+  matchmaker_config_default.yaml: |-
+    api:
+      functions:
+        hostname: "{{ .Values.function.hostName }}"
+        grpcport: "{{ .Values.function.grpcPort }}"
+        httpport: "{{ .Values.function.httpPort }}"
+      
+      evaluator:
+        hostname: "{{ .Values.evaluator.hostName }}"
+        grpcport: "{{ .Values.evaluator.grpcPort }}"
+        httpport: "{{ .Values.evaluator.httpPort }}"    
+  matchmaker_config_override.yaml: |-
+    api:
+      query:
+        hostname: "{{ .Values.query.hostName }}.{{ .Release.Namespace }}.svc.cluster.local"
+        grpcport: "{{ .Values.query.grpcPort }}"
--- a/install/helm/open-match/subcharts/open-match-customize/templates/evaluator.yaml
+++ b/install/helm/open-match/subcharts/open-match-customize/templates/evaluator.yaml
@ -18,7 +18,7 @@
 kind: Service
 apiVersion: v1
 metadata:
-  name: {{ include "openmatch.evaluator.hostName" . }}
+  name: {{ .Values.evaluator.hostName }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -46,20 +46,20 @@ spec:
 apiVersion: autoscaling/v1
 kind: HorizontalPodAutoscaler
 metadata:
-  name: {{ include "openmatch.evaluator.hostName" . }}
+  name: {{ .Values.evaluator.hostName }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
 spec:
  scaleTargetRef:
    apiVersion: apps/v1
    kind: Deployment
-    name: {{ include "openmatch.evaluator.hostName" . }}
+    name: {{ .Values.evaluator.hostName }}
  {{- include "openmatch.HorizontalPodAutoscaler.spec.common" . | nindent 2 }}
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "openmatch.evaluator.hostName" . }}
+  name: {{ .Values.evaluator.hostName }}
  namespace: {{ .Release.Namespace }}
  labels:
    app: {{ template "openmatch.name" . }}
@ -82,13 +82,12 @@ spec:
        component: evaluator
        release: {{ .Release.Name }}
    spec:
-      {{- include "openmatch.labels.nodegrouping" . | nindent 6 }}
      volumes:
-        {{- include "openmatch.volumes.configs" (. | merge (dict "configs" .Values.evaluatorConfigs)) | nindent 8}}
+        {{- include "openmatch.volumes.configs" (dict "configs" .Values.evaluatorConfigs) | nindent 8}}
        {{- include "openmatch.volumes.tls" . | nindent 8}}
-      serviceAccountName: {{ include "openmatch.serviceAccount.name" . }}
+      serviceAccountName: {{ .Values.global.kubernetes.serviceAccount }}
      containers:
-      - name: {{ include "openmatch.evaluator.hostName" . }}
+      - name: {{ .Values.evaluator.hostName }}
        volumeMounts:
          {{- include "openmatch.volumemounts.configs" (dict "configs" .Values.evaluatorConfigs) | nindent 10 }}
          {{- include "openmatch.volumemounts.tls" . | nindent 10 }}
--- a/install/helm/open-match/subcharts/open-match-customize/templates/matchfunctions.yaml
+++ b/install/helm/open-match/subcharts/open-match-customize/templates/matchfunctions.yaml
@ -18,7 +18,7 @@
 kind: Service
 apiVersion: v1
 metadata:
-  name: {{ include "openmatchcustomize.function.hostName" . }}
+  name: {{ .Values.function.hostName }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -46,20 +46,20 @@ spec:
 apiVersion: autoscaling/v1
 kind: HorizontalPodAutoscaler
 metadata:
-  name: {{ include "openmatchcustomize.function.hostName" . }}
+  name: {{ .Values.function.hostName }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
 spec:
  scaleTargetRef:
    apiVersion: apps/v1
    kind: Deployment
-    name: {{ include "openmatchcustomize.function.hostName" . }}
+    name: {{ .Values.function.hostName }}
  {{- include "openmatch.HorizontalPodAutoscaler.spec.common" . | nindent 2 }}
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "openmatchcustomize.function.hostName" . }}
+  name: {{ .Values.function.hostName }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -83,13 +83,12 @@ spec:
        component: matchfunction
        release: {{ .Release.Name }}
    spec:
-      {{- include "openmatch.labels.nodegrouping" . | nindent 6 }}
      volumes:
-        {{- include "openmatch.volumes.configs" (. | merge (dict "configs" .Values.mmfConfigs)) | nindent 8}}
+        {{- include "openmatch.volumes.configs" (dict "configs" .Values.mmfConfigs) | nindent 8}}
        {{- include "openmatch.volumes.tls" . | nindent 8}}
-      serviceAccountName: {{ include "openmatch.serviceAccount.name" . }}
+      serviceAccountName: {{ .Values.global.kubernetes.serviceAccount }}
      containers:
-      - name: {{ include "openmatchcustomize.function.hostName" . }}
+      - name: {{ .Values.function.hostName }}
        volumeMounts:
          {{- include "openmatch.volumemounts.configs" (dict "configs" .Values.mmfConfigs) | nindent 10 }}
          {{- include "openmatch.volumemounts.tls" . | nindent 10 }}
--- a/install/helm/open-match/subcharts/open-match-customize/values.yaml
+++ b/install/helm/open-match/subcharts/open-match-customize/values.yaml
@ -26,7 +26,7 @@ evaluator:
  enabled: false
  replicas: 3
  portType: ClusterIP
-  image: openmatch-default-evaluator
+  image: openmatch-evaluator-go-simple

 evaluatorConfigs: 
  # We use harness to implement the MMFs. MMF itself only requires one configmap but harness expects two,
@ -35,13 +35,11 @@ evaluatorConfigs:
  default:
    volumeName: om-config-volume-default
    mountPath: /app/config/default
-    # This will be parsed through the `tpl` function.
-    configName: '{{ include "openmatch.configmap.default" . }}'
+    configName: customize-configmap
  customize:
-    volumeName: om-config-volume-override
+    volumeName: customize-config-volume
    mountPath: /app/config/override
-    # This will be parsed through the `tpl` function.
-    configName: '{{ include "openmatch.configmap.override" . }}'
+    configName: customize-configmap

 mmfConfigs:
  # We use harness to implement the MMFs. MMF itself only requires one configmap but harness expects two,
@ -50,10 +48,8 @@ mmfConfigs:
  default:
    volumeName: om-config-volume-default
    mountPath: /app/config/default
-    # This will be parsed through the `tpl` function.
-    configName: '{{ include "openmatch.configmap.default" . }}'
+    configName: customize-configmap
  customize:
-    volumeName: om-config-volume-override
+    volumeName: customize-config-volume
    mountPath: /app/config/override
-    # This will be parsed through the `tpl` function.
-    configName: '{{ include "openmatch.configmap.override" . }}'
+    configName: customize-configmap
--- a/install/helm/open-match/subcharts/open-match-scale/dashboards/scale-test.json
+++ b/install/helm/open-match/subcharts/open-match-scale/dashboards/scale-test.json
@ -18,15 +18,13 @@
  "links": [],
  "panels": [
    {
-      "collapsed": false,
      "gridPos": {
        "h": 1,
        "w": 24,
        "x": 0,
        "y": 0
      },
-      "id": 28,
-      "panels": [],
+      "id": 16,
      "title": "Iterations",
      "type": "row"
    },
@ -132,317 +130,11 @@
        "x": 0,
        "y": 9
      },
-      "id": 16,
-      "panels": [],
-      "title": "Backfills",
-      "type": "row"
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "fill": 1,
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 0,
-        "y": 10
-      },
-      "id": 30,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
-      "options": {},
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "sum(rate(scale_backend_backfills_deleted[5m]))",
-          "format": "time_series",
-          "interval": "",
-          "intervalFactor": 1,
-          "legendFormat": "Backfilld Deleted per second",
-          "refId": "B"
-        },
-        {
-          "expr": "sum(rate(scale_backend_backfill_deletes_failed[5m]))",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "legendFormat": "Backfill Deletions Failed per second",
-          "refId": "C"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Backfill Deletion",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "collapsed": false,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 18
-      },
      "id": 14,
      "panels": [],
      "title": "Tickets",
      "type": "row"
    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "fill": 0,
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 0,
-        "y": 19
-      },
-      "id": 26,
-      "legend": {
-        "alignAsTable": true,
-        "avg": false,
-        "current": true,
-        "max": false,
-        "min": false,
-        "rightSide": true,
-        "show": true,
-        "total": false,
-        "values": true
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
-      "options": {},
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "histogram_quantile(0.99, sum(rate(scale_frontend_tickets_time_to_assignment_bucket[5m])) by (le))",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "legendFormat": "99%-ile",
-          "refId": "A"
-        },
-        {
-          "expr": "histogram_quantile(0.95, sum(rate(scale_frontend_tickets_time_to_assignment_bucket[5m])) by (le))",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "legendFormat": "95%-ile",
-          "refId": "B"
-        },
-        {
-          "expr": "histogram_quantile(0.90, sum(rate(scale_frontend_tickets_time_to_assignment_bucket[5m])) by (le))",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "legendFormat": "90%-ile",
-          "refId": "C"
-        },
-        {
-          "expr": "histogram_quantile(0.50, sum(rate(scale_frontend_tickets_time_to_assignment_bucket[5m])) by (le))",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "legendFormat": "50%-ile",
-          "refId": "D"
-        },
-        {
-          "expr": "histogram_quantile(0.10, sum(rate(scale_frontend_tickets_time_to_assignment_bucket[5m])) by (le))",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "legendFormat": "10%-ile",
-          "refId": "E"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Ticket Time to Assignment",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "ms",
-          "label": null,
-          "logBase": 2,
-          "max": null,
-          "min": null,
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "dashLength": 10,
-      "dashes": false,
-      "fill": 1,
-      "gridPos": {
-        "h": 9,
-        "w": 12,
-        "x": 12,
-        "y": 19
-      },
-      "id": 12,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
-      "options": {},
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "sum(rate(scale_backend_sum_tickets_returned[5m]))",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "legendFormat": "Backend Tickets in Matches pers second",
-          "refId": "A"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Tickets In Matches",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
    {
      "aliasColors": {},
      "bars": false,
@ -454,7 +146,7 @@
        "h": 9,
        "w": 12,
        "x": 0,
-        "y": 27
+        "y": 10
      },
      "id": 2,
      "legend": {
@ -543,6 +235,91 @@
        "alignLevel": null
      }
    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "fill": 1,
+      "gridPos": {
+        "h": 9,
+        "w": 12,
+        "x": 12,
+        "y": 10
+      },
+      "id": 12,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "options": {},
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "sum(rate(scale_backend_sum_tickets_returned[5m]))",
+          "format": "time_series",
+          "intervalFactor": 1,
+          "legendFormat": "Backend Tickets in Matches pers second",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Tickets In Matches",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": "0",
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
    {
      "aliasColors": {},
      "bars": false,
@ -553,7 +330,7 @@
        "h": 8,
        "w": 12,
        "x": 12,
-        "y": 28
+        "y": 19
      },
      "id": 22,
      "legend": {
@ -580,7 +357,7 @@
      "steppedLine": false,
      "targets": [
        {
-          "expr": "sum(rate(scale_frontend_tickets_deleted[5m]))",
+          "expr": "sum(rate(scale_backend_tickets_deleted[5m]))",
          "format": "time_series",
          "interval": "",
          "intervalFactor": 1,
@ -588,7 +365,7 @@
          "refId": "B"
        },
        {
-          "expr": "sum(rate(scale_frontend_ticket_deletes_failed[5m]))",
+          "expr": "sum(rate(scale_backend_ticket_deletes_failed[5m]))",
          "format": "time_series",
          "intervalFactor": 1,
          "legendFormat": "Backend Ticket Deletions Failed per second",
@ -636,107 +413,13 @@
        "alignLevel": null
      }
    },
-    {
-      "aliasColors": {},
-      "bars": false,
-      "cacheTimeout": null,
-      "dashLength": 10,
-      "dashes": false,
-      "fill": 1,
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 0,
-        "y": 36
-      },
-      "id": 24,
-      "legend": {
-        "avg": false,
-        "current": false,
-        "max": false,
-        "min": false,
-        "show": true,
-        "total": false,
-        "values": false
-      },
-      "lines": true,
-      "linewidth": 1,
-      "links": [],
-      "nullPointMode": "null",
-      "options": {},
-      "percentage": false,
-      "pointradius": 2,
-      "points": false,
-      "renderer": "flot",
-      "seriesOverrides": [],
-      "spaceLength": 10,
-      "stack": false,
-      "steppedLine": false,
-      "targets": [
-        {
-          "expr": "sum(scale_frontend_runners_waiting)",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "legendFormat": "Runners Waiting To Start",
-          "refId": "A"
-        },
-        {
-          "expr": "sum(scale_frontend_runners_creating)",
-          "format": "time_series",
-          "instant": false,
-          "intervalFactor": 1,
-          "legendFormat": "Runners Creating Ticket",
-          "refId": "B"
-        }
-      ],
-      "thresholds": [],
-      "timeFrom": null,
-      "timeRegions": [],
-      "timeShift": null,
-      "title": "Outstanding Frontend Runners",
-      "tooltip": {
-        "shared": true,
-        "sort": 0,
-        "value_type": "individual"
-      },
-      "type": "graph",
-      "xaxis": {
-        "buckets": null,
-        "mode": "time",
-        "name": null,
-        "show": true,
-        "values": []
-      },
-      "yaxes": [
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": "0",
-          "show": true
-        },
-        {
-          "format": "short",
-          "label": null,
-          "logBase": 1,
-          "max": null,
-          "min": null,
-          "show": true
-        }
-      ],
-      "yaxis": {
-        "align": false,
-        "alignLevel": null
-      }
-    },
    {
      "collapsed": false,
      "gridPos": {
        "h": 1,
        "w": 24,
        "x": 0,
-        "y": 44
+        "y": 27
      },
      "id": 18,
      "panels": [],
@ -753,7 +436,7 @@
        "h": 8,
        "w": 12,
        "x": 0,
-        "y": 45
+        "y": 28
      },
      "id": 6,
      "legend": {
@ -839,7 +522,7 @@
        "h": 8,
        "w": 12,
        "x": 12,
-        "y": 45
+        "y": 28
      },
      "id": 19,
      "legend": {
@ -928,7 +611,7 @@
        "h": 1,
        "w": 24,
        "x": 0,
-        "y": 53
+        "y": 36
      },
      "id": 21,
      "panels": [],
@ -945,7 +628,7 @@
        "h": 8,
        "w": 12,
        "x": 0,
-        "y": 54
+        "y": 37
      },
      "id": 8,
      "legend": {
@ -1030,7 +713,7 @@
        "h": 8,
        "w": 12,
        "x": 12,
-        "y": 54
+        "y": 37
      },
      "id": 10,
      "legend": {
@ -1113,7 +796,7 @@
      }
    }
  ],
-  "refresh": "10s",
+  "refresh": "",
  "schemaVersion": 18,
  "style": "dark",
  "tags": [],
--- a/install/helm/open-match/subcharts/open-match-scale/templates/_helpers.tpl
+++ b/install/helm/open-match/subcharts/open-match-scale/templates/_helpers.tpl
@ -1,42 +0,0 @@
-{*
- Copyright 2019 Google LLC
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*}
-
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "openmatchscale.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
-{{- if contains $name .Release.Name }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
-{{- end }}
-{{- end }}
-{{- end }}
-
-{{- define "openmatchscale.scaleBackend.hostName" -}}
-{{- .Values.scaleBackend.hostName | default (printf "%s-backend" (include "openmatchscale.fullname" . ) ) -}}
-{{- end -}}
-
-{{- define "openmatchscale.scaleFrontend.hostName" -}}
-{{- .Values.scaleFrontend.hostName | default (printf "%s-frontend" (include "openmatchscale.fullname" . ) ) -}}
-{{- end -}}
--- a/install/helm/open-match/subcharts/open-match-scale/templates/scale-backend.yaml
+++ b/install/helm/open-match/subcharts/open-match-scale/templates/scale-backend.yaml
@ -15,7 +15,7 @@
 kind: Service
 apiVersion: v1
 metadata:
-  name: {{ include "openmatchscale.scaleBackend.hostName" . }}
+  name: {{ .Values.scaleBackend.hostName }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -34,7 +34,7 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "openmatchscale.scaleBackend.hostName" . }}
+  name: {{ .Values.scaleBackend.hostName }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -59,11 +59,11 @@ spec:
        release: {{ .Release.Name }}
    spec:
      volumes:
-        {{- include "openmatch.volumes.configs" (. | merge (dict "configs" .Values.configs)) | nindent 8}}
+        {{- include "openmatch.volumes.configs" (dict "configs" .Values.configs) | nindent 8}}
        {{- include "openmatch.volumes.tls" . | nindent 8}}
-      serviceAccountName: {{ include "openmatch.serviceAccount.name" . }}
+      serviceAccountName: {{ .Values.global.kubernetes.serviceAccount }}
      containers:
-      - name: {{ include "openmatchscale.scaleBackend.hostName" . }}
+      - name: {{ .Values.scaleBackend.hostName }}
        volumeMounts:
          {{- include "openmatch.volumemounts.configs" (dict "configs" .Values.configs) | nindent 10 }}
          {{- include "openmatch.volumemounts.tls" . | nindent 10 }}
--- a/install/helm/open-match/subcharts/open-match-scale/templates/scale-configmap.yaml
+++ b/install/helm/open-match/subcharts/open-match-scale/templates/scale-configmap.yaml
@ -0,0 +1,108 @@
+# Copyright 2019 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: scale-configmap
+  namespace: {{ .Release.Namespace }}
+  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
+  labels:
+    app: {{ template "openmatch.name" . }}
+    component: config
+    release: {{ .Release.Name }}
+data:
+  matchmaker_config_default.yaml: |-
+    api:
+      backend:
+        hostname: "{{ .Values.backend.hostName }}"
+        grpcport: "{{ .Values.backend.grpcPort }}"
+        httpport: "{{ .Values.backend.httpPort }}"
+      frontend:
+        hostname: "{{ .Values.frontend.hostName }}"
+        grpcport: "{{ .Values.frontend.grpcPort }}"
+        httpport: "{{ .Values.frontend.httpPort }}"
+      scale:
+        httpport: "51509"
+{{- if .Values.global.tls.enabled }}
+      tls:
+        trustedCertificatePath: "{{.Values.global.tls.rootca.mountPath}}/public.cert"
+        certificatefile: "{{.Values.global.tls.server.mountPath}}/public.cert"
+        privatekey: "{{.Values.global.tls.server.mountPath}}/private.key"
+        rootcertificatefile: "{{.Values.global.tls.rootca.mountPath}}/public.cert"
+{{- end }}
+
+    logging:
+      level: debug
+      {{- if .Values.global.telemetry.stackdriverMetrics.enabled }}
+      format: stackdriver
+      {{- else }}
+      format: text
+      {{- end }}
+      rpc: {{ .Values.global.logging.rpc.enabled }}
+    # Open Match applies the exponential backoff strategy for its retryable gRPC calls.
+    # The settings below are the default backoff configuration used in Open Match.
+    # See https://github.com/cenkalti/backoff/blob/v3/exponential.go for detailed explanations
+    backoff:
+      # The initial retry interval (in milliseconds)
+      initialInterval: 100ms
+      # maxInterval caps the maximum time elapsed for a retry interval
+      maxInterval: 500ms
+      # The next retry interval is multiplied by this multiplier
+      multiplier: 1.5
+      # Randomize the retry interval
+      randFactor: 0.5
+      # maxElapsedTime caps the retry time (in milliseconds)
+      maxElapsedTime: 3000ms
+
+    telemetry:
+      zpages:
+        enable: "{{ .Values.global.telemetry.zpages.enabled }}"
+      jaeger:
+        enable: "{{ .Values.global.telemetry.jaeger.enabled }}"
+        samplerFraction: {{ .Values.global.telemetry.jaeger.samplerFraction }}
+        agentEndpoint: "{{ .Values.global.telemetry.jaeger.agentEndpoint }}"
+        collectorEndpoint: "{{ .Values.global.telemetry.jaeger.collectorEndpoint }}"
+      prometheus:
+        enable: "{{ .Values.global.telemetry.prometheus.enabled }}"
+        endpoint: "{{ .Values.global.telemetry.prometheus.endpoint }}"
+        serviceDiscovery: "{{ .Values.global.telemetry.prometheus.serviceDiscovery }}"
+      stackdriverMetrics:
+        enable: "{{ .Values.global.telemetry.stackdriverMetrics.enabled }}"
+        gcpProjectId: "{{ .Values.global.gcpProjectId }}"
+        prefix: "{{ .Values.global.telemetry.stackdriverMetrics.prefix }}"
+      reportingPeriod: "{{ .Values.global.telemetry.reportingPeriod }}"
+
+  matchmaker_config_override.yaml: |-
+    testConfig:
+      profile: "{{ .Values.testConfig.profile }}"
+      regions:
+      {{- range .Values.testConfig.regions }}
+        - {{ . }}
+      {{- end }}
+      characters:
+      {{- range .Values.testConfig.characters }}
+        - {{ . }}
+      {{- end }}
+      minRating: "{{ .Values.testConfig.minRating }}"
+      maxRating: "{{ .Values.testConfig.maxRating }}"
+      ticketsPerMatch: "{{ .Values.testConfig.ticketsPerMatch }}"
+      multifilter:
+        rangeSize: "{{ .Values.testConfig.multifilter.rangeSize }}"
+        rangeOverlap: "{{ .Values.testConfig.multifilter.rangeOverlap }}"
+      multipool:
+        rangeSize: "{{ .Values.testConfig.multipool.rangeSize }}"
+        rangeOverlap: "{{ .Values.testConfig.multipool.rangeOverlap }}"
+        characterCount: "{{ .Values.testConfig.multipool.characterCount }}"
+
--- a/install/helm/open-match/subcharts/open-match-scale/templates/scale-frontend.yaml
+++ b/install/helm/open-match/subcharts/open-match-scale/templates/scale-frontend.yaml
@ -15,7 +15,7 @@
 kind: Service
 apiVersion: v1
 metadata:
-  name: {{ include "openmatchscale.scaleFrontend.hostName" . }}
+  name: {{ .Values.scaleFrontend.hostName }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -34,7 +34,7 @@ spec:
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: {{ include "openmatchscale.scaleFrontend.hostName" . }}
+  name: {{ .Values.scaleFrontend.hostName }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -59,11 +59,11 @@ spec:
        release: {{ .Release.Name }}
    spec:
      volumes:
-        {{- include "openmatch.volumes.configs" (. | merge (dict "configs" .Values.configs)) | nindent 8}}
+        {{- include "openmatch.volumes.configs" (dict "configs" .Values.configs) | nindent 8}}
        {{- include "openmatch.volumes.tls" . | nindent 8}}
-      serviceAccountName: {{ include "openmatch.serviceAccount.name" . }}
+      serviceAccountName: {{ .Values.global.kubernetes.serviceAccount }}
      containers:
-      - name: {{ include "openmatchscale.scaleFrontend.hostName" . }}
+      - name: {{ .Values.scaleFrontend.hostName }}
        volumeMounts:
          {{- include "openmatch.volumemounts.configs" (dict "configs" .Values.configs) | nindent 10 }}
          {{- include "openmatch.volumemounts.tls" . | nindent 10 }}
--- a/install/helm/open-match/subcharts/open-match-scale/templates/scale-grafana-dashboard.yaml
+++ b/install/helm/open-match/subcharts/open-match-scale/templates/scale-grafana-dashboard.yaml
@ -16,7 +16,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "openmatchscale.fullname" . }}-dashboard
+  name: open-match-scale-dashboard
  namespace: {{ .Release.Namespace }}
  labels:
     grafana_dashboard: "1"
--- a/install/helm/open-match/subcharts/open-match-scale/values.yaml
+++ b/install/helm/open-match/subcharts/open-match-scale/values.yaml
@ -13,13 +13,13 @@
 # limitations under the License.

 scaleFrontend:
-  hostName:
+  hostName: om-scale-frontend
  httpPort: 51509
  replicas: 1
  image: openmatch-scale-frontend

 scaleBackend:
-  hostName:
+  hostName: om-scale-backend
  httpPort: 51509
  replicas: 1
  image: openmatch-scale-backend
@ -28,10 +28,29 @@ configs:
  default:
    volumeName: om-config-volume-default
    mountPath: /app/config/default
-    # This will be parsed through the `tpl` function.
-    configName: '{{ include "openmatch.configmap.default" . }}'
-  override:
-    volumeName: om-config-volume-override
+    configName: scale-configmap
+  scale-configmap:
+    volumeName: scale-config-volume
    mountPath: /app/config/override
-    # This will be parsed through the `tpl` function.
-    configName: '{{ include "openmatch.configmap.override" . }}'
+    configName: scale-configmap
+
+testConfig:
+  profile: scaleprofiles
+  regions:
+    - region.europe-west1
+    - region.europe-west2
+    - region.europe-west3
+    - region.europe-west4
+  characters:
+    - cleric
+    - knight
+  minRating: 0
+  maxRating: 100
+  ticketsPerMatch: 8
+  multifilter:
+    rangeSize: 10
+    rangeOverlap: 5
+  multipool:
+    rangeSize: 10
+    rangeOverlap: 5
+    characterCount: 4
--- a/install/helm/open-match/subcharts/open-match-telemetry/Chart.yaml
+++ b/install/helm/open-match/subcharts/open-match-telemetry/Chart.yaml
@ -20,14 +20,14 @@ version: 0.0.0-dev
 dependencies:
  - name: prometheus
    version: 9.2.0
-    repository: https://charts.helm.sh/stable
+    repository: https://kubernetes-charts.storage.googleapis.com/
    condition: global.telemetry.prometheus.enabled,prometheus.enabled
  - name: grafana
    version: 4.0.1
-    repository: https://charts.helm.sh/stable
+    repository: https://kubernetes-charts.storage.googleapis.com/
    condition: global.telemetry.grafana.enabled,grafana.enabled
  - name: jaeger
    version: 0.13.3
-    repository: https://charts.helm.sh/stable
+    repository: https://kubernetes-charts-incubator.storage.googleapis.com/
    condition: global.telemetry.jaeger.enabled,jaeger.enabled

--- a/install/helm/open-match/subcharts/open-match-telemetry/dashboards/go-processes.json
+++ b/install/helm/open-match/subcharts/open-match-telemetry/dashboards/go-processes.json
@ -62,7 +62,7 @@
      "steppedLine": false,
      "targets": [
        {
-          "expr": "avg by (pod_name) (\n\nsum(\n  rate(container_cpu_usage_seconds_total{container_name!=\"POD\"}[5m]) * on (pod_name) group_left(label_app) max by (pod_name, label_app) (label_replace(kube_pod_labels{label_app=\"open-match\"}, \"pod_name\", \"$1\", \"pod\", \"(.*)\"))\n) by (pod_name, container_name)\n\n/\n\nsum(\n  (container_spec_cpu_quota{container_name!=\"POD\"} * on (pod_name) group_left(label_app) max by (pod_name, label_app) (label_replace(kube_pod_labels{label_app=\"open-match\"}, \"pod_name\", \"$1\", \"pod\", \"(.*)\")))\n  /\n  (container_spec_cpu_period{container_name!=\"POD\"} * on (pod_name) group_left(label_app) max by (pod_name, label_app) (label_replace(kube_pod_labels{label_app=\"open-match\"}, \"pod_name\", \"$1\", \"pod\", \"(.*)\")))\n) by (pod_name, container_name)\n\n*\n\n100\n)\n",
+          "expr": "avg by (pod_name) (\n  sum(\n    rate(container_cpu_usage_seconds_total{pod_name=~\"om-.*\", container_name!=\"POD\"}[5m])\n  ) by (pod_name, container_name) \n  \n  /\n  \n  sum(\n    container_spec_cpu_quota{pod_name=~\"om-.*\", container_name!=\"POD\"} / container_spec_cpu_period{pod_name=~\"om-.*\", container_name!=\"POD\"}\n  ) by (pod_name, container_name) \n  \n  * \n  \n  100\n)",
          "format": "time_series",
          "intervalFactor": 1,
          "legendFormat": "{{pod_name}}",
@ -155,7 +155,7 @@
      "steppedLine": false,
      "targets": [
        {
-          "expr": "avg by (component) (go_goroutines{app=~\"open-match\"})",
+          "expr": "avg by (component) (go_goroutines{app=~\"open-match\", kubernetes_pod_name=~\"om-.*\"})",
          "format": "time_series",
          "intervalFactor": 2,
          "legendFormat": "{{component}}",
@ -256,7 +256,7 @@
      "steppedLine": false,
      "targets": [
        {
-          "expr": "avg by (component,app) (process_resident_memory_bytes{app=~\"open-match\"})",
+          "expr": "avg by (component,app) (process_resident_memory_bytes{app=~\"open-match\", kubernetes_pod_name=~\"om-.*\"})",
          "format": "time_series",
          "intervalFactor": 2,
          "legendFormat": "{{component}} - resident",
@ -265,7 +265,7 @@
          "step": 4
        },
        {
-          "expr": "avg by (component,app) (process_virtual_memory_bytes{app=~\"open-match\"})",
+          "expr": "avg by (component,app) (process_virtual_memory_bytes{app=~\"open-match\", kubernetes_pod_name=~\"om-.*\"})",
          "format": "time_series",
          "intervalFactor": 2,
          "legendFormat": "{{component}} - virtual",
@ -365,7 +365,7 @@
      "steppedLine": false,
      "targets": [
        {
-          "expr": "avg by (component) (deriv(process_resident_memory_bytes{app=~\"open-match\"}[$interval]))",
+          "expr": "avg by (component) (deriv(process_resident_memory_bytes{app=~\"open-match\", kubernetes_pod_name=~\"om-.*\"}[$interval]))",
          "format": "time_series",
          "intervalFactor": 2,
          "legendFormat": "{{component}} - resident",
@ -374,7 +374,7 @@
          "step": 4
        },
        {
-          "expr": "avg by (component) (deriv(process_virtual_memory_bytes{app=~\"open-match\"}[$interval]))",
+          "expr": "avg by (component) (deriv(process_virtual_memory_bytes{app=~\"open-match\", kubernetes_pod_name=~\"om-.*\"}[$interval]))",
          "format": "time_series",
          "intervalFactor": 2,
          "legendFormat": "{{component}} - virtual",
@ -475,7 +475,7 @@
      "steppedLine": false,
      "targets": [
        {
-          "expr": "avg by (component) (go_memstats_alloc_bytes{app=~\"open-match\"})",
+          "expr": "avg by (component) (go_memstats_alloc_bytes{app=~\"open-match\", kubernetes_pod_name=~\"om-.*\"})",
          "format": "time_series",
          "intervalFactor": 2,
          "legendFormat": "{{component}} - bytes allocated",
@ -484,7 +484,7 @@
          "step": 4
        },
        {
-          "expr": "avg by (component) (rate(go_memstats_alloc_bytes_total{app=~\"open-match\"}[$interval]))",
+          "expr": "avg by (component) (rate(go_memstats_alloc_bytes_total{app=~\"open-match\", kubernetes_pod_name=~\"om-.*\"}[$interval]))",
          "format": "time_series",
          "intervalFactor": 2,
          "legendFormat": "{{component}} - alloc rate",
@ -493,7 +493,7 @@
          "step": 4
        },
        {
-          "expr": "avg by (component) (go_memstats_stack_inuse_bytes{app=~\"open-match\"})",
+          "expr": "avg by (component) (go_memstats_stack_inuse_bytes{app=~\"open-match\", kubernetes_pod_name=~\"om-.*\"})",
          "format": "time_series",
          "intervalFactor": 2,
          "legendFormat": "{{component}} - stack inuse",
@ -502,7 +502,7 @@
          "step": 4
        },
        {
-          "expr": "avg by (component) (go_memstats_heap_inuse_bytes{app=~\"open-match\"})",
+          "expr": "avg by (component) (go_memstats_heap_inuse_bytes{app=~\"open-match\", kubernetes_pod_name=~\"om-.*\"})",
          "format": "time_series",
          "hide": false,
          "intervalFactor": 2,
@ -604,7 +604,7 @@
      "steppedLine": false,
      "targets": [
        {
-          "expr": "avg by (component) (deriv(go_memstats_alloc_bytes{app=~\"open-match\"}[$interval]))",
+          "expr": "avg by (component) (deriv(go_memstats_alloc_bytes{app=~\"open-match\", kubernetes_pod_name=~\"om-.*\"}[$interval]))",
          "format": "time_series",
          "intervalFactor": 2,
          "legendFormat": "{{component}} - bytes allocated",
@ -613,7 +613,7 @@
          "step": 4
        },
        {
-          "expr": "avg by (component) (deriv(go_memstats_stack_inuse_bytes{app=~\"open-match\"}[$interval]))",
+          "expr": "avg by (component) (deriv(go_memstats_stack_inuse_bytes{app=~\"open-match\", kubernetes_pod_name=~\"om-.*\"}[$interval]))",
          "format": "time_series",
          "intervalFactor": 2,
          "legendFormat": "{{component}} - stack inuse",
@ -622,7 +622,7 @@
          "step": 4
        },
        {
-          "expr": "avg by (component) (deriv(go_memstats_heap_inuse_bytes{app=~\"open-match\"}[$interval]))",
+          "expr": "avg by (component) (deriv(go_memstats_heap_inuse_bytes{app=~\"open-match\", kubernetes_pod_name=~\"om-.*\"}[$interval]))",
          "format": "time_series",
          "hide": false,
          "intervalFactor": 2,
@ -719,7 +719,7 @@
      "steppedLine": false,
      "targets": [
        {
-          "expr": "avg by (component) (process_open_fds{app=~\"open-match\"})",
+          "expr": "avg by (component) (process_open_fds{app=~\"open-match\", kubernetes_pod_name=~\"om-.*\"})",
          "format": "time_series",
          "intervalFactor": 2,
          "legendFormat": "{{component}}",
@ -815,7 +815,7 @@
      "steppedLine": false,
      "targets": [
        {
-          "expr": "avg by (component) (deriv(process_open_fds{app=~\"open-match\"}[$interval]))",
+          "expr": "avg by (component) (deriv(process_open_fds{app=~\"open-match\", kubernetes_pod_name=~\"om-.*\"}[$interval]))",
          "format": "time_series",
          "intervalFactor": 2,
          "legendFormat": "{{component}}",
@ -911,7 +911,7 @@
      "steppedLine": false,
      "targets": [
        {
-          "expr": "avg by (component, quantile) (go_gc_duration_seconds{app=~\"open-match\"})",
+          "expr": "avg by (component, quantile) (go_gc_duration_seconds{app=~\"open-match\", kubernetes_pod_name=~\"om-.*\"})",
          "format": "time_series",
          "intervalFactor": 2,
          "legendFormat": "{{component}}: {{quantile}}",
--- a/install/helm/open-match/subcharts/open-match-telemetry/dashboards/grpc.json
+++ b/install/helm/open-match/subcharts/open-match-telemetry/dashboards/grpc.json
@ -15,8 +15,8 @@
  "editable": true,
  "gnetId": null,
  "graphTooltip": 0,
-  "id": 2,
-  "iteration": 1580944984710,
+  "id": 3,
+  "iteration": 1580245993833,
  "links": [],
  "panels": [
    {
@ -415,7 +415,7 @@
      },
      "id": 57,
      "panels": [],
-      "title": "openmatch.QueryService/QueryTickets",
+      "title": "openmatch.Mmlogic/QueryTickets",
      "type": "row"
    },
    {
@ -812,7 +812,7 @@
      },
      "id": 29,
      "panels": [],
-      "title": "openmatch.BackendService/AssignTickets",
+      "title": "openmatch.Backend/AssignTickets",
      "type": "row"
    },
    {
@ -1210,7 +1210,7 @@
      "id": 31,
      "panels": [],
      "repeat": null,
-      "title": "openmatch.FrontendService/CreateTicket",
+      "title": "openmatch.Frontend/CreateTicket",
      "type": "row"
    },
    {
@ -2399,7 +2399,7 @@
      },
      "id": 42,
      "panels": [],
-      "title": "openmatch.BackendService/FetchMatches",
+      "title": "openmatch.Frontend/FetchMatches",
      "type": "row"
    },
    {
@ -3191,7 +3191,7 @@
      },
      "id": 23,
      "panels": [],
-      "title": "openmatch.FrontendService/DeleteTicket",
+      "title": "openmatch.Frontend/DeleteTicket",
      "type": "row"
    },
    {
--- a/install/helm/open-match/subcharts/open-match-telemetry/dashboards/match-making.json
+++ b/install/helm/open-match/subcharts/open-match-telemetry/dashboards/match-making.json
--- a/install/helm/open-match/subcharts/open-match-telemetry/dashboards/redis.json
+++ b/install/helm/open-match/subcharts/open-match-telemetry/dashboards/redis.json
@ -16,8 +16,8 @@
  "editable": true,
  "gnetId": 763,
  "graphTooltip": 0,
-  "id": 6,
-  "iteration": 1580946687856,
+  "id": 2,
+  "iteration": 1579655194536,
  "links": [],
  "panels": [
    {
@ -296,7 +296,7 @@
      "bars": false,
      "dashLength": 10,
      "dashes": false,
-      "fill": 0,
+      "fill": 1,
      "gridPos": {
        "h": 7,
        "w": 8,
@ -312,8 +312,6 @@
        "min": false,
        "rightSide": true,
        "show": true,
-        "sort": "current",
-        "sortDesc": true,
        "total": false,
        "values": true
      },
@ -327,54 +325,24 @@
      "pointradius": 2,
      "points": false,
      "renderer": "flot",
-      "seriesOverrides": [
-        {
-          "alias": "limit",
-          "color": "#C4162A",
-          "hideTooltip": true,
-          "legend": false,
-          "nullPointMode": "connected"
-        },
-        {
-          "alias": "request",
-          "color": "#73BF69",
-          "hideTooltip": true,
-          "legend": false,
-          "nullPointMode": "connected"
-        }
-      ],
+      "seriesOverrides": [],
      "spaceLength": 10,
      "stack": false,
      "steppedLine": false,
      "targets": [
        {
-          "expr": "sum(rate(container_cpu_usage_seconds_total{name!~\".*prometheus.*\", image!=\"\", container_name!=\"POD\"}[5m]) * on (pod_name) group_left(label_app) max by (pod_name, label_app) (label_replace(kube_pod_labels{label_app=\"redis\"}, \"pod_name\", \"$1\", \"pod\", \"(.*)\"))) by (pod_name)",
+          "expr": "sum(rate(container_cpu_usage_seconds_total{pod_name=~\"om-redis.*\", name!~\".*prometheus.*\", image!=\"\", container_name!=\"POD\"}[5m])) by (pod_name, container_name) /\nsum(container_spec_cpu_quota{name!~\".*prometheus.*\", image!=\"\", container_name!=\"POD\"}/container_spec_cpu_period{name!~\".*prometheus.*\", image!=\"\", container_name!=\"POD\"}) by (pod_name, container_name) * 100",
          "format": "time_series",
          "intervalFactor": 1,
-          "legendFormat": "{{pod_name}} usage",
+          "legendFormat": "{{pod_name}}",
          "refId": "A"
-        },
-        {
-          "expr": "sum(kube_pod_container_resource_limits_cpu_cores * on (pod) group_left(label_app) max by (pod, label_app) (kube_pod_labels{label_app=\"redis\"})) by (pod)",
-          "format": "time_series",
-          "hide": false,
-          "intervalFactor": 1,
-          "legendFormat": "limit",
-          "refId": "B"
-        },
-        {
-          "expr": "sum(kube_pod_container_resource_requests_cpu_cores * on (pod) group_left(label_app) max by (pod, label_app) (kube_pod_labels{label_app=\"redis\"})) by (pod)",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "legendFormat": "request",
-          "refId": "C"
        }
      ],
      "thresholds": [],
      "timeFrom": null,
      "timeRegions": [],
      "timeShift": null,
-      "title": "CPU Usage",
+      "title": "CPU Usage Percentage of Limit",
      "tooltip": {
        "shared": true,
        "sort": 0,
@ -392,7 +360,7 @@
      "yaxes": [
        {
          "format": "short",
-          "label": "core",
+          "label": "%",
          "logBase": 1,
          "max": null,
          "min": null,
@ -660,8 +628,6 @@
        "min": false,
        "rightSide": true,
        "show": true,
-        "sort": "current",
-        "sortDesc": true,
        "total": false,
        "values": true
      },
@ -689,13 +655,6 @@
          "refId": "A",
          "step": 240,
          "target": ""
-        },
-        {
-          "expr": "sum by (kubernetes_pod_name) (rate(redis_commands_total[5m]))",
-          "format": "time_series",
-          "intervalFactor": 1,
-          "legendFormat": "total - {{kubernetes_pod_name}}",
-          "refId": "B"
        }
      ],
      "thresholds": [],
@ -952,8 +911,8 @@
      {
        "allValue": null,
        "current": {
-          "text": "10.28.0.12:9121",
-          "value": "10.28.0.12:9121"
+          "text": "10.28.0.27:9121",
+          "value": "10.28.0.27:9121"
        },
        "datasource": "Prometheus",
        "definition": "label_values(redis_up, instance)",
--- a/install/helm/open-match/subcharts/open-match-telemetry/dashboards/tickets.json
+++ b/install/helm/open-match/subcharts/open-match-telemetry/dashboards/tickets.json
@ -0,0 +1,290 @@
+{
+    "annotations": {
+      "list": [
+        {
+          "builtIn": 1,
+          "datasource": "-- Grafana --",
+          "enable": true,
+          "hide": true,
+          "iconColor": "rgba(0, 211, 255, 1)",
+          "name": "Annotations & Alerts",
+          "type": "dashboard"
+        }
+      ]
+    },
+    "editable": true,
+    "gnetId": null,
+    "graphTooltip": 0,
+    "id": 3,
+    "iteration": 1562886170229,
+    "links": [],
+    "panels": [
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "fill": 1,
+        "gridPos": {
+          "h": 9,
+          "w": 12,
+          "x": 0,
+          "y": 0
+        },
+        "id": 2,
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "show": true,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "links": [],
+        "nullPointMode": "null",
+        "options": {},
+        "percentage": false,
+        "pointradius": 2,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "sum(rate(frontend_tickets_created[$timewindow]))",
+            "format": "time_series",
+            "intervalFactor": 1,
+            "legendFormat": "Created",
+            "refId": "A"
+          },
+          {
+            "expr": "sum(rate(frontend_tickets_deleted[$timewindow]))",
+            "format": "time_series",
+            "intervalFactor": 1,
+            "legendFormat": "Deleted",
+            "refId": "B"
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "Ticket Flow",
+        "tooltip": {
+          "shared": true,
+          "sort": 0,
+          "value_type": "individual"
+        },
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          },
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
+        }
+      },
+      {
+        "aliasColors": {},
+        "bars": false,
+        "dashLength": 10,
+        "dashes": false,
+        "description": "",
+        "fill": 1,
+        "gridPos": {
+          "h": 8,
+          "w": 12,
+          "x": 12,
+          "y": 0
+        },
+        "id": 4,
+        "interval": "",
+        "legend": {
+          "avg": false,
+          "current": false,
+          "max": false,
+          "min": false,
+          "show": true,
+          "total": false,
+          "values": false
+        },
+        "lines": true,
+        "linewidth": 1,
+        "links": [],
+        "nullPointMode": "null",
+        "options": {},
+        "percentage": false,
+        "pointradius": 2,
+        "points": false,
+        "renderer": "flot",
+        "seriesOverrides": [],
+        "spaceLength": 10,
+        "stack": false,
+        "steppedLine": false,
+        "targets": [
+          {
+            "expr": "sum(rate(frontend_tickets_assignments_retrieved[$timewindow]))",
+            "format": "time_series",
+            "intervalFactor": 1,
+            "legendFormat": "Assignments Retrieved",
+            "refId": "A"
+          }
+        ],
+        "thresholds": [],
+        "timeFrom": null,
+        "timeRegions": [],
+        "timeShift": null,
+        "title": "Assignments",
+        "tooltip": {
+          "shared": true,
+          "sort": 0,
+          "value_type": "individual"
+        },
+        "type": "graph",
+        "xaxis": {
+          "buckets": null,
+          "mode": "time",
+          "name": null,
+          "show": true,
+          "values": []
+        },
+        "yaxes": [
+          {
+            "decimals": null,
+            "format": "reqps",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": "0",
+            "show": true
+          },
+          {
+            "format": "short",
+            "label": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
+            "show": true
+          }
+        ],
+        "yaxis": {
+          "align": false,
+          "alignLevel": null
+        }
+      }
+    ],
+    "schemaVersion": 18,
+    "style": "dark",
+    "tags": [],
+    "templating": {
+      "list": [
+        {
+          "allValue": null,
+          "current": {
+            "text": "5m",
+            "value": "5m"
+          },
+          "hide": 0,
+          "includeAll": false,
+          "label": "Time Window",
+          "multi": false,
+          "name": "timewindow",
+          "options": [
+            {
+              "selected": true,
+              "text": "5m",
+              "value": "5m"
+            },
+            {
+              "selected": false,
+              "text": "10m",
+              "value": "10m"
+            },
+            {
+              "selected": false,
+              "text": "15m",
+              "value": "15m"
+            },
+            {
+              "selected": false,
+              "text": "30m",
+              "value": "30m"
+            },
+            {
+              "selected": false,
+              "text": "1h",
+              "value": "1h"
+            },
+            {
+              "selected": false,
+              "text": "4h",
+              "value": "4h"
+            }
+          ],
+          "query": "5m,10m,15m,30m,1h,4h",
+          "skipUrlSync": false,
+          "type": "custom"
+        }
+      ]
+    },
+    "time": {
+      "from": "now-6h",
+      "to": "now"
+    },
+    "timepicker": {
+      "refresh_intervals": [
+        "5s",
+        "10s",
+        "30s",
+        "1m",
+        "5m",
+        "15m",
+        "30m",
+        "1h",
+        "2h",
+        "1d"
+      ],
+      "time_options": [
+        "5m",
+        "15m",
+        "1h",
+        "6h",
+        "12h",
+        "24h",
+        "2d",
+        "7d",
+        "30d"
+      ]
+    },
+    "timezone": "",
+    "title": "Tickets",
+    "uid": "TlgyFfIWz",
+    "version": 6
+  }
--- a/install/helm/open-match/subcharts/open-match-telemetry/templates/default-grafana-dashboards.yaml
+++ b/install/helm/open-match/subcharts/open-match-telemetry/templates/default-grafana-dashboards.yaml
@ -16,7 +16,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "openmatch.fullname" . }}-dashboards
+  name: open-match-dashboards
  labels:
     grafana_dashboard: "1"
 data:
--- a/install/helm/open-match/subcharts/open-match-telemetry/values.yaml
+++ b/install/helm/open-match/subcharts/open-match-telemetry/values.yaml
@ -142,10 +142,17 @@ grafana:
  notifiers: {}
  sidecar:
    dashboards:
-      enabled: true
-    datasources:
-      enabled: true
+        enabled: true
  plugins: grafana-piechart-panel
+  datasources:
+    datasources.yaml:
+      apiVersion: 1
+      datasources:
+      - name: Prometheus
+        type: prometheus
+        url: http://open-match-prometheus-server.{{ .Release.Namespace }}.svc.cluster.local:80/
+        access: proxy
+        isDefault: true

 jaeger:
  enabled: true
--- a/install/helm/open-match/templates/_helpers.tpl
+++ b/install/helm/open-match/templates/_helpers.tpl
@ -22,26 +22,6 @@ Expand the name of the chart.
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}

-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-Instead of .Chart.Name, we hard-code "open-match" as we need to call this from subcharts, but get the
-same result as if called from this chart.
-*/}}
-{{- define "openmatch.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- $name := default "open-match" .Values.nameOverride }}
-{{- if contains $name .Release.Name }}
-{{- .Release.Name | trunc 63 | trimSuffix "-" }}
-{{- else }}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
-{{- end }}
-{{- end }}
-{{- end }}
-
 {{/*
 Render chart metadata labels: "chart", "heritage" unless "openmatch.noChartMeta" is set.
 */}}
@ -77,7 +57,7 @@ resources:
 {{- range $configIndex, $configValues := .configs }}
 - name: {{ $configValues.volumeName }}
  configMap:
-    name: {{ tpl $configValues.configName $ }}
+    name: {{ $configValues.configName }}
 {{- end }}
 {{- end -}}

@ -94,10 +74,10 @@ resources:
 {{- if .Values.global.tls.enabled }}
 - name: tls-server-volume
  secret:
-    secretName: {{ include "openmatch.fullname" . }}-tls-server
+    secretName: om-tls-server
 - name: root-ca-volume
  secret:
-    secretName: {{ include "openmatch.fullname" . }}-tls-rootca
+    secretName: om-tls-rootca
 {{- end -}}
 {{- end -}}

@ -112,7 +92,7 @@ resources:
 {{- if .Values.redis.usePassword }}
 - name: redis-password
  secret:
-    secretName: {{ include "call-nested" (list . "redis" "redis.fullname") }}
+    secretName: {{ .Values.redis.fullnameOverride }}
 {{- end -}}
 {{- end -}}

@ -155,72 +135,3 @@ minReplicas: {{ .Values.global.kubernetes.horizontalPodAutoScaler.minReplicas }}
 maxReplicas: {{ .Values.global.kubernetes.horizontalPodAutoScaler.maxReplicas }}
 targetCPUUtilizationPercentage: {{ .Values.global.kubernetes.horizontalPodAutoScaler.targetCPUUtilizationPercentage }}
 {{- end -}}
-
-{{- define "openmatch.serviceAccount.name" -}}
-{{- .Values.global.kubernetes.serviceAccount | default (printf "%s-unprivileged-service" (include "openmatch.fullname" . ) ) -}}
-{{- end -}}
-
-{{- define "openmatch.swaggerui.hostName" -}}
-{{- .Values.swaggerui.hostName | default (printf "%s-swaggerui" (include "openmatch.fullname" . ) ) -}}
-{{- end -}}
-
-{{- define "openmatch.query.hostName" -}}
-{{- .Values.query.hostName | default (printf "%s-query" (include "openmatch.fullname" . ) ) -}}
-{{- end -}}
-
-{{- define "openmatch.frontend.hostName" -}}
-{{- .Values.frontend.hostName | default (printf "%s-frontend" (include "openmatch.fullname" . ) ) -}}
-{{- end -}}
-
-{{- define "openmatch.backend.hostName" -}}
-{{- .Values.backend.hostName | default (printf "%s-backend" (include "openmatch.fullname" . ) ) -}}
-{{- end -}}
-
-{{- define "openmatch.synchronizer.hostName" -}}
-{{- .Values.synchronizer.hostName | default (printf "%s-synchronizer" (include "openmatch.fullname" . ) ) -}}
-{{- end -}}
-
-{{- define "openmatch.evaluator.hostName" -}}
-{{- .Values.evaluator.hostName | default (printf "%s-evaluator" (include "openmatch.fullname" . ) ) -}}
-{{- end -}}
-
-{{- define "openmatch.configmap.default" -}}
-{{- printf "%s-configmap-default" (include "openmatch.fullname" . ) -}}
-{{- end -}}
-
-{{- define "openmatch.configmap.override" -}}
-{{- printf "%s-configmap-override" (include "openmatch.fullname" . ) -}}
-{{- end -}}
-
-{{- define "openmatch.jaeger.agent" -}}
-{{- if index .Values "open-match-telemetry" "enabled" -}}
-{{- if index .Values "open-match-telemetry" "jaeger" "enabled" -}}
-{{ include "call-nested" (list . "open-match-telemetry.jaeger" "jaeger.agent.name") }}:6831
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{- define "openmatch.jaeger.collector" -}}
-{{- if index .Values "open-match-telemetry" "enabled" -}}
-{{- if index .Values "open-match-telemetry" "jaeger" "enabled" -}}
-http://{{ include "call-nested" (list . "open-match-telemetry.jaeger" "jaeger.collector.name") }}:14268/api/traces
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Call templates from sub-charts in a synthesized context, workaround for https://github.com/helm/helm/issues/3920
-Mainly useful for things like `{{ include "call-nested" (list . "redis" "redis.fullname") }}`
-https://github.com/helm/helm/issues/4535#issuecomment-416022809
-https://github.com/helm/helm/issues/4535#issuecomment-477778391
-*/}}
-{{- define "call-nested" }}
-{{- $dot := index . 0 }}
-{{- $subchart := index . 1 | splitList "." }}
-{{- $template := index . 2 }}
-{{- $values := $dot.Values }}
-{{- range $subchart }}
-{{- $values = index $values . }}
-{{- end }}
-{{- include $template (dict "Chart" (dict "Name" (last $subchart)) "Values" $values "Release" $dot.Release "Capabilities" $dot.Capabilities) }}
-{{- end }}
--- a/install/helm/open-match/templates/backend.yaml
+++ b/install/helm/open-match/templates/backend.yaml
@ -16,7 +16,7 @@
 kind: Service
 apiVersion: v1
 metadata:
-  name: {{ include "openmatch.backend.hostName" . }}
+  name: {{ .Values.backend.hostName }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -44,19 +44,19 @@ spec:
 apiVersion: autoscaling/v1
 kind: HorizontalPodAutoscaler
 metadata:
-  name: {{ include "openmatch.backend.hostName" . }}
+  name: {{ .Values.backend.hostName }}
  namespace: {{ .Release.Namespace }}
 spec:
  scaleTargetRef:
    apiVersion: apps/v1
    kind: Deployment
-    name: {{ include "openmatch.backend.hostName" . }}
+    name: {{ .Values.backend.hostName }}
  {{- include "openmatch.HorizontalPodAutoscaler.spec.common" . | nindent 2 }}
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "openmatch.backend.hostName" . }}
+  name: {{ .Values.backend.hostName }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -82,12 +82,12 @@ spec:
    spec:
      {{- include "openmatch.labels.nodegrouping" . | nindent 6 }}
      volumes:
-        {{- include "openmatch.volumes.configs" (. | merge (dict "configs" .Values.configs)) | nindent 8}}
+        {{- include "openmatch.volumes.configs" (dict "configs" .Values.configs) | nindent 8}}
        {{- include "openmatch.volumes.tls" . | nindent 8}}
        {{- include "openmatch.volumes.withredis" . | nindent 8}}
-      serviceAccountName: {{ include "openmatch.serviceAccount.name" . }}
+      serviceAccountName: {{ .Values.global.kubernetes.serviceAccount }}
      containers:
-      - name: {{ include "openmatch.backend.hostName" . }}
+      - name: {{ .Values.backend.hostName }}
        volumeMounts:
          {{- include "openmatch.volumemounts.configs" (dict "configs" .Values.configs) | nindent 10 }}
          {{- include "openmatch.volumemounts.tls" . | nindent 10 }}
--- a/install/helm/open-match/templates/frontend.yaml
+++ b/install/helm/open-match/templates/frontend.yaml
@ -16,7 +16,7 @@
 kind: Service
 apiVersion: v1
 metadata:
-  name: {{ include "openmatch.frontend.hostName" . }}
+  name: {{ .Values.frontend.hostName }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -44,19 +44,19 @@ spec:
 apiVersion: autoscaling/v1
 kind: HorizontalPodAutoscaler
 metadata:
-  name: {{ include "openmatch.frontend.hostName" . }}
+  name: {{ .Values.frontend.hostName }}
  namespace: {{ .Release.Namespace }}
 spec:
  scaleTargetRef:
    apiVersion: apps/v1
    kind: Deployment
-    name: {{ include "openmatch.frontend.hostName" . }}
+    name: {{ .Values.frontend.hostName }}
  {{- include "openmatch.HorizontalPodAutoscaler.spec.common" . | nindent 2 }}
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "openmatch.frontend.hostName" . }}
+  name: {{ .Values.frontend.hostName }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -82,12 +82,12 @@ spec:
    spec:
      {{- include "openmatch.labels.nodegrouping" . | nindent 6 }}
      volumes:
-        {{- include "openmatch.volumes.configs" (. | merge (dict "configs" .Values.configs)) | nindent 8}}
+        {{- include "openmatch.volumes.configs" (dict "configs" .Values.configs) | nindent 8}}
        {{- include "openmatch.volumes.tls" . | nindent 8}}
        {{- include "openmatch.volumes.withredis" . | nindent 8}}
-      serviceAccountName: {{ include "openmatch.serviceAccount.name" . }}
+      serviceAccountName: {{ .Values.global.kubernetes.serviceAccount }}
      containers:
-      - name: {{ include "openmatch.frontend.hostName" . }}
+      - name: {{ .Values.frontend.hostName }}
        volumeMounts:
          {{- include "openmatch.volumemounts.configs" (dict "configs" .Values.configs) | nindent 10 }}
          {{- include "openmatch.volumemounts.tls" . | nindent 10 }}
--- a/install/helm/open-match/templates/om-configmap-default.yaml
+++ b/install/helm/open-match/templates/om-configmap-default.yaml
@ -16,7 +16,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "openmatch.configmap.default" . }}
+  name: om-configmap-default
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -50,33 +50,28 @@ data:

    api:
      backend:
-        hostname: "{{ include "openmatch.backend.hostName" . }}"
+        hostname: "{{ .Values.backend.hostName }}"
        grpcport: "{{ .Values.backend.grpcPort }}"
        httpport: "{{ .Values.backend.httpPort }}"
      frontend:
-        hostname: "{{ include "openmatch.frontend.hostName" . }}"
+        hostname: "{{ .Values.frontend.hostName }}"
        grpcport: "{{ .Values.frontend.grpcPort }}"
        httpport: "{{ .Values.frontend.httpPort }}"
      query:
-        hostname: "{{ include "openmatch.query.hostName" . }}"
+        hostname: "{{ .Values.query.hostName }}"
        grpcport: "{{ .Values.query.grpcPort }}"
        httpport: "{{ .Values.query.httpPort }}"
      synchronizer:
-        hostname: "{{ include "openmatch.synchronizer.hostName" . }}"
+        hostname: "{{ .Values.synchronizer.hostName }}"
        grpcport: "{{ .Values.synchronizer.grpcPort }}"
        httpport: "{{ .Values.synchronizer.httpPort }}"
      swaggerui:
-        hostname: "{{ include "openmatch.swaggerui.hostName" . }}"
+        hostname: "{{ .Values.swaggerui.hostName }}"
        httpport: "{{ .Values.swaggerui.httpPort }}"
-
-      # Configurations for api.test and api.scale are used for testing.
-      test:
-        hostname: "{{ include "openmatch.fullname" . }}-test"
-        grpcport: "50509"
+      scale-frontend:
        httpport: "51509"
-      scale:
-        httpport: "51509"
-
+      scale-backend:
+        httpport: "51510"
 {{- if .Values.global.tls.enabled }}
      tls:
        trustedCertificatePath: "{{.Values.global.tls.rootca.mountPath}}/public.cert"
@ -85,47 +80,39 @@ data:
        rootcertificatefile: "{{.Values.global.tls.rootca.mountPath}}/public.cert"
 {{- end }}

+    storage:
+      ignoreListTTL: {{ index .Values "open-match-core" "ignoreListTTL" }}
+      page:
+        size: 10000
+
    redis:
-{{- if index .Values "open-match-core" "redis" "enabled" }}
-{{- if index .Values "redis" "sentinel" "enabled"}}
-      sentinelPort: {{ .Values.redis.sentinel.port }}
-      sentinelMaster: {{ .Values.redis.sentinel.masterSet }}
-      sentinelHostname: {{ include "call-nested" (list . "redis" "redis.fullname") }}
-      sentinelUsePassword: {{ .Values.redis.sentinel.usePassword }}
-{{- else}}
-      # Open Match's default Redis setups
-      hostname: {{ include "call-nested" (list . "redis" "redis.fullname") }}-master.{{ .Release.Namespace }}.svc.cluster.local
+{{- if index .Values "open-match-core" "redis" "install" }}
+      hostname: {{ .Values.redis.fullnameOverride }}-master.{{ .Release.Namespace }}.svc.cluster.local
      port: {{ .Values.redis.redisPort }}
      user: {{ .Values.redis.user }}
-{{- end}}
 {{- else }}
-      # BYO Redis setups
      hostname: {{ index .Values "open-match-core" "redis" "hostname" }}
      port: {{ index .Values "open-match-core" "redis" "port" }}
      user: {{ index .Values "open-match-core" "redis" "user" }}
 {{- end }}
-      usePassword: {{ .Values.redis.usePassword }}
+{{- if .Values.redis.usePassword }}
      passwordPath: {{ .Values.redis.secretMountPath }}/redis-password
+{{- end }}
      pool:
        maxIdle: {{ index .Values "open-match-core" "redis" "pool" "maxIdle" }}
        maxActive: {{ index .Values "open-match-core" "redis" "pool" "maxActive" }}
        idleTimeout: {{ index .Values "open-match-core" "redis" "pool" "idleTimeout" }}
        healthCheckTimeout: {{ index .Values "open-match-core" "redis" "pool" "healthCheckTimeout" }}
+      expiration: 43200

    telemetry:
-      reportingPeriod: "{{ .Values.global.telemetry.reportingPeriod }}"
-      traceSamplingFraction: "{{ .Values.global.telemetry.traceSamplingFraction }}"
      zpages:
        enable: "{{ .Values.global.telemetry.zpages.enabled }}"
      jaeger:
        enable: "{{ .Values.global.telemetry.jaeger.enabled }}"
-{{- if .Values.global.telemetry.jaeger.enabled }}
-        agentEndpoint: "{{ tpl .Values.global.telemetry.jaeger.agentEndpoint . }}"
-        collectorEndpoint: "{{ tpl .Values.global.telemetry.jaeger.collectorEndpoint . }}"
-{{- else }}
-        agentEndpoint: ""
-        collectorEndpoint: ""
-{{- end }}
+        samplerFraction: {{ .Values.global.telemetry.jaeger.samplerFraction }}
+        agentEndpoint: "{{ .Values.global.telemetry.jaeger.agentEndpoint }}"
+        collectorEndpoint: "{{ .Values.global.telemetry.jaeger.collectorEndpoint }}"
      prometheus:
        enable: "{{ .Values.global.telemetry.prometheus.enabled }}"
        endpoint: "{{ .Values.global.telemetry.prometheus.endpoint }}"
--- a/install/helm/open-match/templates/om-configmap-override.yaml
+++ b/install/helm/open-match/templates/om-configmap-override.yaml
@ -16,7 +16,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "openmatch.configmap.override" . }}
+  name: om-configmap-override
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -25,25 +25,12 @@ metadata:
    release: {{ .Release.Name }}
 data:
  matchmaker_config_override.yaml: |-
-    # Length of time between first fetch matches call, and when no further fetch
-    # matches calls will join the current evaluation/synchronization cycle, 
-    # instead waiting for the next cycle.
-    registrationInterval:  {{ index .Values "open-match-core" "registrationInterval" }}
-    # Length of time after match function as started before it will be canceled,
-    # and evaluator call input is EOF.
-    proposalCollectionInterval: {{ index .Values "open-match-core" "proposalCollectionInterval" }}
-    # Time after a ticket has been returned from fetch matches (marked as pending)
-    # before it automatically becomes active again and will be returned by query
-    # calls.
-    pendingReleaseTimeout: {{ index .Values "open-match-core" "pendingReleaseTimeout" }}
-    # Time after a ticket has been assigned before it is automatically delted.
-    assignedDeleteTimeout: {{ index .Values "open-match-core" "assignedDeleteTimeout" }}
-    # Maximum number of tickets to return on a single QueryTicketsResponse.
-    queryPageSize: {{ index .Values "open-match-core" "queryPageSize" }}
-    backfillLockTimeout: {{ index .Values "open-match-core" "backfillLockTimeout" }}
    api:
      evaluator:
-        hostname: "{{ include "openmatch.evaluator.hostName" . }}"
+        hostname: "{{ .Values.evaluator.hostName }}"
        grpcport: "{{ .Values.evaluator.grpcPort }}"
        httpport: "{{ .Values.evaluator.httpPort }}"
+    synchronizer:
+      registrationIntervalMs: 250ms
+      proposalCollectionIntervalMs: 20000ms
 {{- end }}
--- a/install/helm/open-match/templates/podsecuritypolicy.yaml
+++ b/install/helm/open-match/templates/podsecuritypolicy.yaml
@ -14,11 +14,11 @@

 {{- if index .Values "open-match-core" "enabled" }}
 {{- if empty .Values.ci }}
-# This is the least restricted PSP used to create privileged pods to disable THP in host kernel.
+# om-redis-podsecuritypolicy is the least restricted PSP used to create privileged pods to disable THP in host kernel.
 apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
-  name: {{ include "openmatch.fullname" . }}-redis-podsecuritypolicy
+  name: om-redis-podsecuritypolicy
  namespace: {{ .Release.Namespace }}
  annotations:
    {{- include "openmatch.chartmeta" . | nindent 4 }}
@ -51,11 +51,11 @@ spec:
  fsGroup:
    rule: 'RunAsAny'
 ---
-# This does not allow creating privileged pods and restrict binded pods to use the specified port ranges.
+# om-core-podsecuritypolicy does not allow creating privileged pods and restrict binded pods to use the specified port ranges.
 apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
-  name: {{ include "openmatch.fullname" . }}-core-podsecuritypolicy
+  name: om-core-podsecuritypolicy
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
--- a/install/helm/open-match/templates/query.yaml
+++ b/install/helm/open-match/templates/query.yaml
@ -16,7 +16,7 @@
 kind: Service
 apiVersion: v1
 metadata:
-  name: {{ include "openmatch.query.hostName" . }}
+  name: {{ .Values.query.hostName }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -44,19 +44,19 @@ spec:
 apiVersion: autoscaling/v1
 kind: HorizontalPodAutoscaler
 metadata:
-  name: {{ include "openmatch.query.hostName" . }}
+  name: {{ .Values.query.hostName }}
  namespace: {{ .Release.Namespace }}
 spec:
  scaleTargetRef:
    apiVersion: apps/v1
    kind: Deployment
-    name: {{ include "openmatch.query.hostName" . }}
+    name: {{ .Values.query.hostName }}
  {{- include "openmatch.HorizontalPodAutoscaler.spec.common" . | nindent 2 }}
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "openmatch.query.hostName" . }}
+  name: {{ .Values.query.hostName }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -82,12 +82,12 @@ spec:
    spec:
      {{- include "openmatch.labels.nodegrouping" . | nindent 6 }}
      volumes:
-        {{- include "openmatch.volumes.configs" (. | merge (dict "configs" .Values.configs)) | nindent 8}}
+        {{- include "openmatch.volumes.configs" (dict "configs" .Values.configs) | nindent 8}}
        {{- include "openmatch.volumes.tls" . | nindent 8}}
        {{- include "openmatch.volumes.withredis" . | nindent 8 }}
-      serviceAccountName: {{ include "openmatch.serviceAccount.name" . }}
+      serviceAccountName: {{ .Values.global.kubernetes.serviceAccount }}
      containers:
-      - name: {{ include "openmatch.query.hostName" . }}
+      - name: {{ .Values.query.hostName }}
        volumeMounts:
          {{- include "openmatch.volumemounts.configs" (dict "configs" .Values.configs) | nindent 10 }}
          {{- include "openmatch.volumemounts.tls" . | nindent 10 }}
--- a/install/helm/open-match/templates/service-account.yaml
+++ b/install/helm/open-match/templates/service-account.yaml
@ -29,7 +29,7 @@ metadata:
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "openmatch.serviceAccount.name" . }}
+  name: {{ .Values.global.kubernetes.serviceAccount }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -40,26 +40,28 @@ automountServiceAccountToken: true
 kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: {{ include "openmatch.fullname" . }}-service-role
+  name: om-service-role
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
    app: {{ template "openmatch.name" . }}
    release: {{ .Release.Name }}
 rules:
+# Define om-service-role to use om-core-podsecuritypolicy
 - apiGroups:
  - extensions
  resources:
  - podsecuritypolicies
  resourceNames:
-  - {{ include "openmatch.fullname" . }}-core-podsecuritypolicy
+  - om-core-podsecuritypolicy
  verbs:
  - use
 ---
+# This applies om-service-role to the open-match unprivileged service account under the release namespace. 
 kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: {{ include "openmatch.fullname" . }}-service-role-binding
+  name: om-service-role-binding
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -71,33 +73,34 @@ subjects:
  apiGroup: rbac.authorization.k8s.io
 roleRef:
  kind: Role
-  name: {{ include "openmatch.fullname" . }}-service-role
+  name: om-service-role
  apiGroup: rbac.authorization.k8s.io
 ---
-{{- if index .Values "open-match-core" "redis" "enabled" }}
 kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: {{ include "openmatch.fullname" . }}-redis-role
+  name: om-redis-role
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
    app: {{ template "openmatch.name" . }}
    release: {{ .Release.Name }}
 rules:
+# Define om-redis-role to use om-redis-podsecuritypolicy
 - apiGroups:
  - extensions
  resources:
  - podsecuritypolicies
  resourceNames:
-  - {{ include "openmatch.fullname" . }}-redis-podsecuritypolicy
+  - om-redis-podsecuritypolicy
  verbs:
  - use
 ---
+# This applies om-redis role to the om-redis privileged service account under the release namespace.
 kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: {{ include "openmatch.fullname" . }}-redis-role-binding
+  name: om-redis-role-binding
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -105,11 +108,10 @@ metadata:
    release: {{ .Release.Name }}
 subjects:
 - kind: ServiceAccount
-  name: {{ include "call-nested" (list . "redis" "redis.serviceAccountName") }}
+  name: {{ .Values.redis.serviceAccount.name }} # Redis service account
  namespace: {{ .Release.Namespace }}
 roleRef:
  kind: Role
-  name: {{ include "openmatch.fullname" . }}-redis-role
+  name: om-redis-role
  apiGroup: rbac.authorization.k8s.io
 {{- end }}
-{{- end }}
--- a/install/helm/open-match/templates/swaggerui.yaml
+++ b/install/helm/open-match/templates/swaggerui.yaml
@ -12,11 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-{{- if index .Values "open-match-core" "swaggerui" "enabled" }}
+{{- if index .Values "open-match-core" "enabled" }}
 kind: Service
 apiVersion: v1
 metadata:
-  name: {{ include "openmatch.swaggerui.hostName" . }}
+  name: {{ .Values.swaggerui.hostName }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -36,7 +36,7 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "openmatch.swaggerui.hostName" . }}
+  name: {{ .Values.swaggerui.hostName }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -61,11 +61,11 @@ spec:
    spec:
      {{- include "openmatch.labels.nodegrouping" . | nindent 6 }}
      volumes:
-        {{- include "openmatch.volumes.configs" (. | merge (dict "configs" .Values.configs)) | nindent 8}}
+        {{- include "openmatch.volumes.configs" (dict "configs" .Values.configs) | nindent 8}}
        {{- include "openmatch.volumes.tls" . | nindent 8}}
-      serviceAccountName: {{ include "openmatch.serviceAccount.name" . }}
+      serviceAccountName: {{ .Values.global.kubernetes.serviceAccount }}
      containers:
-      - name: {{ include "openmatch.swaggerui.hostName" . }}
+      - name: {{ .Values.swaggerui.hostName }}
        volumeMounts:
          {{- include "openmatch.volumemounts.configs" (dict "configs" .Values.configs) | nindent 10 }}
          {{- include "openmatch.volumemounts.tls" . | nindent 10 }}
--- a/install/helm/open-match/templates/synchronizer.yaml
+++ b/install/helm/open-match/templates/synchronizer.yaml
@ -16,7 +16,7 @@
 kind: Service
 apiVersion: v1
 metadata:
-  name: {{ include "openmatch.synchronizer.hostName" . }}
+  name: {{ .Values.synchronizer.hostName }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -40,7 +40,7 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "openmatch.synchronizer.hostName" . }}
+  name: {{ .Values.synchronizer.hostName }}
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -66,12 +66,12 @@ spec:
    spec:
      {{- include "openmatch.labels.nodegrouping" . | nindent 6 }}
      volumes:
-        {{- include "openmatch.volumes.configs" (. | merge (dict "configs" .Values.configs)) | nindent 8}}
+        {{- include "openmatch.volumes.configs" (dict "configs" .Values.configs) | nindent 8}}
        {{- include "openmatch.volumes.tls" . | nindent 8}}
        {{- include "openmatch.volumes.withredis" . | nindent 8 }}
-      serviceAccountName: {{ include "openmatch.serviceAccount.name" . }}
+      serviceAccountName: {{ .Values.global.kubernetes.serviceAccount }}
      containers:
-      - name: {{ include "openmatch.synchronizer.hostName" . }}
+      - name: {{ .Values.synchronizer.hostName }}
        volumeMounts:
          {{- include "openmatch.volumemounts.configs" (dict "configs" .Values.configs) | nindent 10 }}
          {{- include "openmatch.volumemounts.tls" . | nindent 10 }}
--- a/install/helm/open-match/templates/tests/om-test-role-binding.yaml
+++ b/install/helm/open-match/templates/tests/om-test-role-binding.yaml
@ -1,23 +1,8 @@
-# Copyright 2019 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-{{- if .Values.ci }}
-
+# This applies om-test-role to the open-match-test-service account under the release namespace. 
 kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: {{ include "openmatch.fullname" . }}-test-role-binding
+  name: om-test-role-binding
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -25,11 +10,9 @@ metadata:
    release: {{ .Release.Name }}
 subjects:
 - kind: ServiceAccount
-  name: {{ include "openmatch.fullname" . }}-test-service
+  name: open-match-test-service
  namespace: {{ .Release.Namespace }}
 roleRef:
  kind: Role
-  name: {{ include "openmatch.fullname" . }}-test-role
+  name: om-test-role
  apiGroup: rbac.authorization.k8s.io
-
-{{- end }}
--- a/install/helm/open-match/templates/tests/om-test-role.yaml
+++ b/install/helm/open-match/templates/tests/om-test-role.yaml
@ -1,38 +1,23 @@
-# Copyright 2019 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-{{- if .Values.ci }}
-
 kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: {{ include "openmatch.fullname" . }}-test-role
+  name: om-test-role
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
    app: {{ template "openmatch.name" . }}
    release: {{ .Release.Name }}
 rules:
+# Define om-test-role to use om-core-podsecuritypolicy
 - apiGroups:
  - extensions
  resources:
  - podsecuritypolicies
  resourceNames:
-  - {{ include "openmatch.fullname" . }}-core-podsecuritypolicy
+  - om-core-podsecuritypolicy
  verbs:
  - use
-# Grant this role get & list permission for k8s endpoints and pods resources
+# Grant om-test-role get & list permission for k8s endpoints and pods resources
 # Required for e2e in-cluster testing.
 - apiGroups:
  - ""
@ -42,5 +27,3 @@ rules:
  verbs:
  - get
  - list
-
-{{- end }}
--- a/install/helm/open-match/templates/tests/om-test-service-account.yaml
+++ b/install/helm/open-match/templates/tests/om-test-service-account.yaml
@ -1,29 +1,11 @@
-# Copyright 2019 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-{{- if .Values.ci }}
-
-# Create a service account for test services.
+# Create a service account for open-match-test services.
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "openmatch.fullname" . }}-test-service
+  name: open-match-test-service
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
    app: {{ template "openmatch.name" . }}
    release: {{ .Release.Name }}
 automountServiceAccountToken: true
-
-{{- end }}
--- a/install/helm/open-match/templates/tests/om-test.yaml
+++ b/install/helm/open-match/templates/tests/om-test.yaml
@ -1,83 +1,24 @@
-# Copyright 2019 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-{{- if .Values.ci }}
-
-kind: Service
-apiVersion: v1
-metadata:
-  name: {{ include "openmatch.fullname" . }}-test
-  namespace: {{ .Release.Namespace }}
-  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
-  labels:
-    app: {{ template "openmatch.name" . }}
-    component: test
-    release: {{ .Release.Name }}
-spec:
-  selector:
-    app: {{ template "openmatch.name" . }}
-    component: test
-    release: {{ .Release.Name }}
-  ports:
-  - name: grpc
-    protocol: TCP
-    port: 50509
-  - name: http
-    protocol: TCP
-    port: 51509
---
 apiVersion: v1
 kind: Pod
 metadata:
-  name: {{ include "openmatch.fullname" . }}-test
+  name: om-test
  namespace: {{ .Release.Namespace }}
  annotations: 
    {{- include "openmatch.chartmeta" . | nindent 4 }}
    "helm.sh/hook": test-success
  labels:
    app: {{ template "openmatch.name" . }}
-    component: test
+    component: om-test
    release: {{ .Release.Name }}
 spec:
  # Specifies the duration in seconds relative to the startTime that the job may be active before the system tries to terminate it.
  activeDeadlineSeconds: 900
-  serviceAccountName: {{ include "openmatch.fullname" . }}-test-service
+  serviceAccountName: open-match-test-service
  automountServiceAccountToken: true
-  volumes:
-  - configMap:
-      defaultMode: 420
-      name: {{ include "openmatch.configmap.default" . }}
-    name: om-config-volume-default
-  - configMap:
-      defaultMode: 420
-      name: {{ include "openmatch.configmap.override" . }}
-    name: om-config-volume-override
  containers:
-  - name: {{ include "openmatch.fullname" . }}-test
-    volumeMounts:
-    - mountPath: /app/config/default
-      name: om-config-volume-default
-    - mountPath: /app/config/override
-      name: om-config-volume-override
-    image: "{{ .Values.global.image.registry }}/openmatch-base-build:{{ .Values.global.image.tag }}"
-    ports:
-    - name: grpc
-      containerPort: 50509
-    - name: http
-      containerPort: 51509
+  - image: "{{ .Values.global.image.registry }}/openmatch-base-build:{{ .Values.global.image.tag }}"
    imagePullPolicy: Always
-    name: test
+    name: om-test
    resources:
      limits:
        memory: 800Mi
@ -91,7 +32,7 @@ spec:
    command: ["go"]
    args:
    - "test"
-    - "./internal/testing/e2e"
+    - "./test/e2e"
    - "-v"
    - "-timeout"
    - "150s"
@ -99,5 +40,3 @@ spec:
    - "-tags"
    - "e2ecluster"
  restartPolicy: Never
-
-{{- end }}
--- a/install/helm/open-match/templates/tls-secret.yaml
+++ b/install/helm/open-match/templates/tls-secret.yaml
@ -17,7 +17,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ include "openmatch.fullname" . }}-tls-rootca
+  name: om-tls-rootca
  namespace: {{ .Release.Namespace }}
  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
  labels:
@ -31,9 +31,9 @@ data:
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ include "openmatch.fullname" . }}-tls-server
+  name: om-tls-server
  namespace: {{ .Release.Namespace }}
-  annotations: {{- include "openmatch.chartmeta" . | nindent 4 }}
+  annotations: {{- include "openmatch.chartmeta" . | nindent 2 }}
  labels:
    app: {{ template "openmatch.name" . }}
    component: tls
--- a/install/helm/open-match/values-production.yaml
+++ b/install/helm/open-match/values-production.yaml
@ -23,7 +23,7 @@
 # Begins the configuration section for `query` component in Open Match.
 # query:
 #
-#   # Override the default in-cluster domain name for the `query` service to om-query.
+#   # Specifies om-query as the in-cluster domain name for the `query` service.
 #   hostName: om-query
 #
 #   # Specifies the port for receiving RESTful HTTP requests in the `query` service.
@ -44,68 +44,67 @@
 #   # Specifies the image name to be used in a Kubernetes pod for `query` compoenent.
 #   image: openmatch-query
 swaggerui: &swaggerui
-  hostName:
+  hostName: om-swaggerui
  httpPort: 51500
  portType: ClusterIP
  replicas: 1
  image: openmatch-swaggerui
 query: &query
-  hostName:
+  hostName: om-query
  grpcPort: 50503
  httpPort: 51503
  portType: ClusterIP
  replicas: 3
  image: openmatch-query
 frontend: &frontend
-  hostName:
+  hostName: om-frontend
  grpcPort: 50504
  httpPort: 51504
  portType: ClusterIP
  replicas: 3
  image: openmatch-frontend
 backend: &backend
-  hostName:
+  hostName: om-backend
  grpcPort: 50505
  httpPort: 51505
  portType: ClusterIP
  replicas: 3
  image: openmatch-backend
 synchronizer: &synchronizer
-  hostName:
+  hostName: om-synchronizer
  grpcPort: 50506
  httpPort: 51506
  portType: ClusterIP
  replicas: 1
  image: openmatch-synchronizer
 evaluator: &evaluator
-  hostName:
+  hostName: om-evaluator
  grpcPort: 50508
  httpPort: 51508
  replicas: 3
 function: &function
-  hostName:
+  hostName: om-function
  grpcPort: 50502
  httpPort: 51502
  replicas: 3

 # Specifies the location and name of the Open Match application-level config volumes.
-# Used in template: `openmatch.volumemounts.configs` and `openmatch.volumes.configs` under `templates/_helpers.tpl` file.
+  # Used in template: `openmatch.volumemounts.configs` and `openmatch.volumes.configs` under `templates/_helpers.tpl` file.
 configs:
  default:
    volumeName: om-config-volume-default
    mountPath: /app/config/default
-    # This will be parsed through the `tpl` function.
-    configName: '{{ include "openmatch.configmap.default" . }}'
+    configName: om-configmap-default
  override:
    volumeName: om-config-volume-override
    mountPath: /app/config/override
-    # This will be parsed through the `tpl` function.
-    configName: '{{ include "openmatch.configmap.override" . }}'
+    configName: om-configmap-override

 # Override Redis settings
 # https://hub.helm.sh/charts/stable/redis
 # https://github.com/helm/charts/tree/master/stable/redis
 redis:
+  fullnameOverride: om-redis
  redisPort: 6379
  usePassword: false
  usePasswordFile: false
@ -113,10 +112,6 @@ redis:
  configmap: |
    maxclients 100000
    maxmemory 500000000
-  sentinel:
-    enabled: true
-    masterSet: om-redis-master
-    port: 26379
  master:
    disableCommands: [] # don't disable 'FLUSH-' commands
    resources:
@ -134,6 +129,7 @@ redis:
    slaveCount: 3
  serviceAccount:
    create: true
+    name: open-match-redis-service
  slave:
    persistence:
      enabled: false
@ -172,44 +168,26 @@ redis:
 # Controls if users need to install backend, frontend, query, om-configmap, and swaggerui.
 open-match-core:
  enabled: true
-
-  # Length of time between first fetch matches call, and when no further fetch
-  # matches calls will join the current evaluation/synchronization cycle,
-  # instead waiting for the next cycle.
-  registrationInterval: 250ms
-  # Length of time after match function as started before it will be canceled,
-  # and evaluator call input is EOF.
-  proposalCollectionInterval: 20s
-  # Time after a ticket has been returned from fetch matches (marked as pending)
-  # before it automatically becomes active again and will be returned by query
-  # calls.
-  pendingReleaseTimeout: 1m
-  # Time after a ticket has been assigned before it is automatically delted.
-  assignedDeleteTimeout: 10m
-  # Maximum number of tickets to return on a single QueryTicketsResponse.
-  queryPageSize: 10000
-  # Duration for redis locks to expire.
-  backfillLockTimeout: 1m
-
+  ignoreListTTL: 60000ms
  redis:
-    enabled: true
-    # If open-match-core.redis.enabled is set to false, have Open Match components talk to this redis address instead.
+    install: true
+    # If open-match-core.redis.install is set to false, have Open Match components talk to this redis address instead.
    # Otherwise the default is set to the om-redis instance.
    hostname: # Your redis server address
    port: 6379
-    user:
+    user: 
    pool:
      maxIdle: 500
      maxActive: 500
      idleTimeout: 0
      healthCheckTimeout: 300ms
-  swaggerui:
-    enabled: false

 # Controls if users need to install scale testing setup for Open Match.
 open-match-scale:
  # Switch the value between true/false to turn on/off this subchart
  enabled: false
+  frontend: *frontend
+  backend: *backend

 # Controls if users need to install the monitoring tools in Open Match.
 open-match-telemetry:
@ -222,6 +200,7 @@ open-match-customize:
  enabled: false
  evaluator: *evaluator
  function: *function
+  query: *query
  # You can override the evaluator/mmf image
  # evaluator:
  #   image: [YOUR_EVALUATOR_IMAGE]
@ -248,8 +227,8 @@ global:
      limits:
        memory: 3Gi
        cpu: 2
-    # Overrides the name of the service account which provides an identity for processes that run in a Pod in Open Match.
-    serviceAccount:
+    # Defines a service account which provides an identity for processes that run in a Pod in Open Match.
+    serviceAccount: open-match-unprivileged-service
    # Use this field if you need to override the port type for all services defined in this chart
    service:
      portType:
@ -271,21 +250,21 @@ global:
  # Use this field if you need to override the image registry and image tag for all services defined in this chart
  image:
    registry: gcr.io/open-match-public-images
-    tag: 0.0.0-dev
+    tag: 0.9.0
    pullPolicy: Always

+
  # Expose the telemetry configurations to all subcharts because prometheus, for example,
  # requires pod-level annotation to customize its scrape path.
  # See definitions in templates/_helpers.tpl - "prometheus.annotations" section for details
  telemetry:
-    reportingPeriod: "1m"
-    traceSamplingFraction: 0.005 # What fraction of traces to sample.
    zpages:
      enabled: true
    jaeger:
      enabled: false
-      agentEndpoint: '{{ include "openmatch.jaeger.agent" . }}'
-      collectorEndpoint: '{{ include "openmatch.jaeger.collector" . }}'
+      samplerFraction: 0.005 # Configures a sampler that samples a given fraction of traces.
+      agentEndpoint: "open-match-jaeger-agent:6831"
+      collectorEndpoint: "http://open-match-jaeger-collector:14268/api/traces"
    prometheus:
      enabled: false
      endpoint: "/metrics"
@ -295,3 +274,4 @@ global:
      prefix: "open_match"
    grafana:
      enabled: false
+    reportingPeriod: "1m"
--- a/install/helm/open-match/values.yaml
+++ b/install/helm/open-match/values.yaml
@ -23,7 +23,7 @@
 # Begins the configuration section for `query` component in Open Match.
 # query:
 #
-#   # Override the default in-cluster domain name for the `query` service to om-query.
+#   # Specifies om-query as the in-cluster domain name for the `query` service.
 #   hostName: om-query
 #
 #   # Specifies the port for receiving RESTful HTTP requests in the `query` service.
@ -44,46 +44,46 @@
 #   # Specifies the image name to be used in a Kubernetes pod for `query` compoenent.
 #   image: openmatch-query
 swaggerui: &swaggerui
-  hostName:
+  hostName: om-swaggerui
  httpPort: 51500
  portType: ClusterIP
  replicas: 1
  image: openmatch-swaggerui
 query: &query
-  hostName:
+  hostName: om-query
  grpcPort: 50503
  httpPort: 51503
  portType: ClusterIP
  replicas: 3
  image: openmatch-query
 frontend: &frontend
-  hostName:
+  hostName: om-frontend
  grpcPort: 50504
  httpPort: 51504
  portType: ClusterIP
  replicas: 3
  image: openmatch-frontend
 backend: &backend
-  hostName:
+  hostName: om-backend
  grpcPort: 50505
  httpPort: 51505
  portType: ClusterIP
  replicas: 3
  image: openmatch-backend
 synchronizer: &synchronizer
-  hostName:
+  hostName: om-synchronizer
  grpcPort: 50506
  httpPort: 51506
  portType: ClusterIP
  replicas: 1
  image: openmatch-synchronizer
 evaluator: &evaluator
-  hostName:
+  hostName: om-evaluator
  grpcPort: 50508
  httpPort: 51508
  replicas: 3
 function: &function
-  hostName:
+  hostName: om-function
  grpcPort: 50502
  httpPort: 51502
  replicas: 3
@ -94,18 +94,17 @@ configs:
  default:
    volumeName: om-config-volume-default
    mountPath: /app/config/default
-    # This will be parsed through the `tpl` function.
-    configName: '{{ include "openmatch.configmap.default" . }}'
+    configName: om-configmap-default
  override:
    volumeName: om-config-volume-override
    mountPath: /app/config/override
-    # This will be parsed through the `tpl` function.
-    configName: '{{ include "openmatch.configmap.override" . }}'
+    configName: om-configmap-override

 # Override Redis settings
 # https://hub.helm.sh/charts/stable/redis
 # https://github.com/helm/charts/tree/master/stable/redis
 redis:
+  fullnameOverride: om-redis
  redisPort: 6379
  usePassword: false
  usePasswordFile: false
@ -113,11 +112,6 @@ redis:
  configmap: |
    maxclients 100000
    maxmemory 300000000
-  sentinel:
-    enabled: true
-    masterSet: om-redis-master
-    port: 26379
-    usePassword: false
  master:
    disableCommands: [] # don't disable 'FLUSH-' commands
    resources:
@ -130,6 +124,7 @@ redis:
    slaveCount: 2
  serviceAccount:
    create: true
+    name: open-match-redis-service
  sysctlImage:
    # Enable this setting in production if you are running Open Match under Linux environment
    enabled: false
@ -158,44 +153,26 @@ redis:
 # Controls if users need to install backend, frontend, query, om-configmap, and swaggerui.
 open-match-core:
  enabled: true
-
-  # Length of time between first fetch matches call, and when no further fetch
-  # matches calls will join the current evaluation/synchronization cycle,
-  # instead waiting for the next cycle.
-  registrationInterval: 250ms
-  # Length of time after match function as started before it will be canceled,
-  # and evaluator call input is EOF.
-  proposalCollectionInterval: 20s
-  # Time after a ticket has been returned from fetch matches (marked as pending)
-  # before it automatically becomes active again and will be returned by query
-  # calls.
-  pendingReleaseTimeout: 1m
-  # Time after a ticket has been assigned before it is automatically delted.
-  assignedDeleteTimeout: 10m
-  # Maximum number of tickets to return on a single QueryTicketsResponse.
-  queryPageSize: 10000
-  # Duration for redis locks to expire.
-  backfillLockTimeout: 1m
-
+  ignoreListTTL: 60000ms
  redis:
-    enabled: true
-    # If open-match-core.redis.enabled is set to false, have Open Match components talk to this redis address instead.
+    install: true
+    # If open-match-core.redis.install is set to false, have Open Match components talk to this redis address instead.
    # Otherwise the default is set to the om-redis instance.
    hostname: # Your redis server address
    port: 6379
-    user:
+    user: 
    pool:
      maxIdle: 200
      maxActive: 0
      idleTimeout: 0
      healthCheckTimeout: 300ms
-  swaggerui:
-    enabled: true

 # Controls if users need to install scale testing setup for Open Match.
 open-match-scale:
  # Switch the value between true/false to turn on/off this subchart
  enabled: false
+  frontend: *frontend
+  backend: *backend

 # Controls if users need to install the monitoring tools in Open Match.
 open-match-telemetry:
@ -208,6 +185,7 @@ open-match-customize:
  enabled: false
  evaluator: *evaluator
  function: *function
+  query: *query
  # You can override the evaluator/mmf image
  # evaluator:
  #   image: [YOUR_EVALUATOR_IMAGE]
@ -234,8 +212,8 @@ global:
      limits:
        memory: 100Mi
        cpu: 100m
-    # Overrides the name of the service account which provides an identity for processes that run in a Pod in Open Match.
-    serviceAccount:
+    # Defines a service account which provides an identity for processes that run in a Pod in Open Match.
+    serviceAccount: open-match-unprivileged-service
    # Use this field if you need to override the port type for all services defined in this chart
    service:
      portType:
@ -257,21 +235,21 @@ global:
  # Use this field if you need to override the image registry and image tag for all services defined in this chart
  image:
    registry: gcr.io/open-match-public-images
-    tag: 1.3.0-rc.1
+    tag: 0.9.0
    pullPolicy: Always

+
  # Expose the telemetry configurations to all subcharts because prometheus, for example,
  # requires pod-level annotation to customize its scrape path.
  # See definitions in templates/_helpers.tpl - "prometheus.annotations" section for details
  telemetry:
-    reportingPeriod: "1m"
-    traceSamplingFraction: 0.01 # What fraction of traces to sample.
    zpages:
      enabled: true
    jaeger:
      enabled: false
-      agentEndpoint: '{{ include "openmatch.jaeger.agent" . }}'
-      collectorEndpoint: '{{ include "openmatch.jaeger.collector" . }}'
+      samplerFraction: 0.01 # Configures a sampler that samples a given fraction of traces.
+      agentEndpoint: "open-match-jaeger-agent:6831"
+      collectorEndpoint: "http://open-match-jaeger-collector:14268/api/traces"
    prometheus:
      enabled: false
      endpoint: "/metrics"
@ -281,5 +259,4 @@ global:
      prefix: "open_match"
    grafana:
      enabled: false
-      # This will be called with `tpl` in the open-match-telemetry subchart namespace.
-      prometheusServer: 'http://{{ include "call-nested" (list . "prometheus" "prometheus.server.fullname") }}.{{ .Release.Namespace }}.svc.cluster.local:80/'
+    reportingPeriod: "1m"
--- a/internal/app/appmain.go
+++ b/internal/app/appmain.go
@ -0,0 +1,55 @@
+// Copyright 2019 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package app contains the common application initialization code for Open Match servers.
+package app
+
+import (
+	"github.com/sirupsen/logrus"
+	"open-match.dev/open-match/internal/config"
+	"open-match.dev/open-match/internal/logging"
+	"open-match.dev/open-match/internal/rpc"
+)
+
+var (
+	logger = logrus.WithFields(logrus.Fields{
+		"app":       "openmatch",
+		"component": "app.main",
+	})
+)
+
+// RunApplication creates a server.
+func RunApplication(serverName string, getCfg func() (config.View, error), bindService func(*rpc.ServerParams, config.View) error) {
+	cfg, err := getCfg()
+	if err != nil {
+		logger.WithFields(logrus.Fields{
+			"error": err.Error(),
+		}).Fatalf("cannot read configuration.")
+	}
+	logging.ConfigureLogging(cfg)
+	p, err := rpc.NewServerParamsFromConfig(cfg, "api."+serverName)
+	if err != nil {
+		logger.WithFields(logrus.Fields{
+			"error": err.Error(),
+		}).Fatalf("cannot construct server.")
+	}
+
+	if err := bindService(p, cfg); err != nil {
+		logger.WithFields(logrus.Fields{
+			"error": err.Error(),
+		}).Fatalf("failed to bind %s service.", serverName)
+	}
+
+	rpc.MustServeForever(p)
+}
--- a/internal/app/backend/backend.go
+++ b/internal/app/backend/backend.go
@ -15,81 +15,25 @@
 package backend

 import (
-	"go.opencensus.io/stats"
-	"go.opencensus.io/stats/view"
 	"google.golang.org/grpc"
-	"open-match.dev/open-match/internal/appmain"
+	"open-match.dev/open-match/internal/config"
 	"open-match.dev/open-match/internal/rpc"
 	"open-match.dev/open-match/internal/statestore"
-	"open-match.dev/open-match/internal/telemetry"
 	"open-match.dev/open-match/pkg/pb"
 )

-var (
-	totalBytesPerMatch      = stats.Int64("open-match.dev/backend/total_bytes_per_match", "Total bytes per match", stats.UnitBytes)
-	ticketsPerMatch         = stats.Int64("open-match.dev/backend/tickets_per_match", "Number of tickets per match", stats.UnitDimensionless)
-	ticketsReleased         = stats.Int64("open-match.dev/backend/tickets_released", "Number of tickets released per request", stats.UnitDimensionless)
-	ticketsAssigned         = stats.Int64("open-match.dev/backend/tickets_assigned", "Number of tickets assigned per request", stats.UnitDimensionless)
-	ticketsTimeToAssignment = stats.Int64("open-match.dev/backend/ticket_time_to_assignment", "Time to assignment for tickets", stats.UnitMilliseconds)
-
-	totalMatchesView = &view.View{
-		Measure:     totalBytesPerMatch,
-		Name:        "open-match.dev/backend/total_matches",
-		Description: "Total number of matches",
-		Aggregation: view.Count(),
-	}
-	totalBytesPerMatchView = &view.View{
-		Measure:     totalBytesPerMatch,
-		Name:        "open-match.dev/backend/total_bytes_per_match",
-		Description: "Total bytes per match",
-		Aggregation: telemetry.DefaultBytesDistribution,
-	}
-	ticketsPerMatchView = &view.View{
-		Measure:     ticketsPerMatch,
-		Name:        "open-match.dev/backend/tickets_per_match",
-		Description: "Tickets per ticket",
-		Aggregation: telemetry.DefaultCountDistribution,
-	}
-	ticketsAssignedView = &view.View{
-		Measure:     ticketsAssigned,
-		Name:        "open-match.dev/backend/tickets_assigned",
-		Description: "Number of tickets assigned per request",
-		Aggregation: view.Sum(),
-	}
-	ticketsReleasedView = &view.View{
-		Measure:     ticketsReleased,
-		Name:        "open-match.dev/backend/tickets_released",
-		Description: "Number of tickets released per request",
-		Aggregation: view.Sum(),
-	}
-
-	ticketsTimeToAssignmentView = &view.View{
-		Measure:     ticketsTimeToAssignment,
-		Name:        "open-match.dev/backend/ticket_time_to_assignment",
-		Description: "Time to assignment for tickets",
-		Aggregation: telemetry.DefaultMillisecondsDistribution,
-	}
-)
-
 // BindService creates the backend service and binds it to the serving harness.
-func BindService(p *appmain.Params, b *appmain.Bindings) error {
+func BindService(p *rpc.ServerParams, cfg config.View) error {
 	service := &backendService{
-		synchronizer: newSynchronizerClient(p.Config()),
-		store:        statestore.New(p.Config()),
-		cc:           rpc.NewClientCache(p.Config()),
+		synchronizer: newSynchronizerClient(cfg),
+		store:        statestore.New(cfg),
+		cc:           rpc.NewClientCache(cfg),
 	}

-	b.AddHealthCheckFunc(service.store.HealthCheck)
-	b.AddHandleFunc(func(s *grpc.Server) {
+	p.AddHealthCheckFunc(service.store.HealthCheck)
+	p.AddHandleFunc(func(s *grpc.Server) {
 		pb.RegisterBackendServiceServer(s, service)
 	}, pb.RegisterBackendServiceHandlerFromEndpoint)
-	b.RegisterViews(
-		totalMatchesView,
-		totalBytesPerMatchView,
-		ticketsPerMatchView,
-		ticketsAssignedView,
-		ticketsReleasedView,
-		ticketsTimeToAssignmentView,
-	)
+
 	return nil
 }
--- a/internal/app/backend/backend_service.go
+++ b/internal/app/backend/backend_service.go
@ -22,24 +22,17 @@ import (
 	"net/http"
 	"strings"
 	"sync"
-	"time"
-
-	"go.opencensus.io/stats"

 	"github.com/golang/protobuf/jsonpb"
-	"github.com/golang/protobuf/proto"
-	"github.com/golang/protobuf/ptypes"
-	"github.com/pkg/errors"
-	"github.com/rs/xid"
 	"github.com/sirupsen/logrus"
-	"golang.org/x/sync/errgroup"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
-	"open-match.dev/open-match/internal/appmain/contextcause"
 	"open-match.dev/open-match/internal/ipb"
+	"open-match.dev/open-match/internal/omerror"
 	"open-match.dev/open-match/internal/rpc"
 	"open-match.dev/open-match/internal/statestore"
+	"open-match.dev/open-match/internal/telemetry"
 	"open-match.dev/open-match/pkg/pb"
 )

@ -56,7 +49,10 @@ var (
 		"app":       "openmatch",
 		"component": "app.backend",
 	})
-	errBackfillGenerationMismatch = errors.New("backfill generation mismatch")
+	mMatchesFetched          = telemetry.Counter("backend/matches_fetched", "matches fetched")
+	mMatchesSentToEvaluation = telemetry.Counter("backend/matches_sent_to_evaluation", "matches sent to evaluation")
+	mTicketsAssigned         = telemetry.Counter("backend/tickets_assigned", "tickets assigned")
+	mTicketsReleased         = telemetry.Counter("backend/tickets_released", "tickets released")
 )

 // FetchMatches triggers a MatchFunction with the specified MatchProfiles, while each MatchProfile
@ -64,50 +60,56 @@ var (
 // FetchMatches immediately returns an error if it encounters any execution failures.
 //   - If the synchronizer is enabled, FetchMatch will then call the synchronizer to deduplicate proposals with overlapped tickets.
 func (s *backendService) FetchMatches(req *pb.FetchMatchesRequest, stream pb.BackendService_FetchMatchesServer) error {
-	if req.Config == nil {
+	if req.GetConfig() == nil {
 		return status.Error(codes.InvalidArgument, ".config is required")
 	}
-	if req.Profile == nil {
+	if req.GetProfile() == nil {
 		return status.Error(codes.InvalidArgument, ".profile is required")
 	}

-	// Error group for handling the synchronizer calls only.
-	eg, ctx := errgroup.WithContext(stream.Context())
-	syncStream, err := s.synchronizer.synchronize(ctx)
+	syncStream, err := s.synchronizer.synchronize(stream.Context())
 	if err != nil {
 		return err
 	}

-	// The mmf must be canceled if the synchronizer call fails (which will
-	// cancel the context from the error group).  However the synchronizer call
-	// is NOT dependant on the mmf call.
-	mmfCtx, cancelMmfs := contextcause.WithCancelCause(ctx)
+	mmfCtx, cancelMmfs := context.WithCancel(stream.Context())
 	// Closed when mmfs should start.
 	startMmfs := make(chan struct{})
 	proposals := make(chan *pb.Match)
 	m := &sync.Map{}

-	eg.Go(func() error {
-		return synchronizeSend(ctx, syncStream, m, proposals)
-	})
-	eg.Go(func() error {
-		return synchronizeRecv(ctx, syncStream, m, stream, startMmfs, cancelMmfs, s.store)
+	synchronizerWait := omerror.WaitOnErrors(logger, func() error {
+		return synchronizeSend(stream.Context(), syncStream, m, proposals)
+	}, func() error {
+		return synchronizeRecv(syncStream, m, stream, startMmfs, cancelMmfs)
 	})

-	var mmfErr error
-	select {
-	case <-mmfCtx.Done():
-		mmfErr = fmt.Errorf("mmf was never started")
-	case <-startMmfs:
-		mmfErr = callMmf(mmfCtx, s.cc, req, proposals)
-	}
+	mmfWait := omerror.WaitOnErrors(logger, func() error {
+		select {
+		case <-mmfCtx.Done():
+			return fmt.Errorf("Mmf was never started")
+		case <-startMmfs:
+		}

-	syncErr := eg.Wait()
+		return callMmf(mmfCtx, s.cc, req, proposals)
+	})
+
+	syncErr := synchronizerWait()
+	// Fetch Matches should never block on just the match function.
+	// Must cancel mmfs after synchronizer is done and before checking mmf error
+	// because the synchronizer call could fail while the mmf call blocks.
+	cancelMmfs()
+	mmfErr := mmfWait()

 	// TODO: Send mmf error in FetchSummary instead of erroring call.
 	if syncErr != nil || mmfErr != nil {
+		logger.WithFields(logrus.Fields{
+			"syncErr": syncErr,
+			"mmfErr":  mmfErr,
+		}).Error("error(s) in FetchMatches call.")
+
 		return fmt.Errorf(
-			"error(s) in FetchMatches call. syncErr=[%v], mmfErr=[%v]",
+			"Error(s) in FetchMatches call. syncErr=[%s], mmfErr=[%s]",
 			syncErr,
 			mmfErr,
 		)
@ -126,10 +128,8 @@ sendProposals:
 			if !ok {
 				break sendProposals
 			}
-			_, loaded := m.LoadOrStore(p.GetMatchId(), p)
-			if loaded {
-				return fmt.Errorf("MatchMakingFunction returned same match_id twice: \"%s\"", p.GetMatchId())
-			}
+			m.Store(p.GetMatchId(), p)
+			telemetry.RecordUnitMeasurement(ctx, mMatchesSentToEvaluation)
 			err := syncStream.Send(&ipb.SynchronizeRequest{Proposal: p})
 			if err != nil {
 				return fmt.Errorf("error sending proposal to synchronizer: %w", err)
@ -144,7 +144,7 @@ sendProposals:
 	return nil
 }

-func synchronizeRecv(ctx context.Context, syncStream synchronizerStream, m *sync.Map, stream pb.BackendService_FetchMatchesServer, startMmfs chan<- struct{}, cancelMmfs contextcause.CancelErrFunc, store statestore.Service) error {
+func synchronizeRecv(syncStream synchronizerStream, m *sync.Map, stream pb.BackendService_FetchMatchesServer, startMmfs chan<- struct{}, cancelMmfs context.CancelFunc) error {
 	var startMmfsOnce sync.Once

 	for {
@ -163,42 +163,12 @@ func synchronizeRecv(ctx context.Context, syncStream synchronizerStream, m *sync
 		}

 		if resp.CancelMmfs {
-			cancelMmfs(errors.New("match function ran longer than proposal window, canceling"))
+			cancelMmfs()
 		}

-		if v, ok := m.Load(resp.GetMatchId()); ok {
-			match, ok := v.(*pb.Match)
-			if !ok {
-				return fmt.Errorf("error casting sync map value into *pb.Match: %w", err)
-			}
-
-			backfill := match.GetBackfill()
-			if backfill != nil {
-				ticketIds := make([]string, 0, len(match.Tickets))
-
-				for _, t := range match.Tickets {
-					ticketIds = append(ticketIds, t.Id)
-				}
-
-				err = createOrUpdateBackfill(ctx, backfill, ticketIds, store)
-				if err != nil {
-					e, ok := status.FromError(err)
-					if err == errBackfillGenerationMismatch || (ok && e.Code() == codes.NotFound) {
-						err = doReleaseTickets(ctx, ticketIds, store)
-						if err != nil {
-							logger.WithError(err).Errorf("failed to remove match tickets from pending release: %v", ticketIds)
-						}
-
-						continue
-					}
-
-					return errors.Wrapf(err, "failed to handle match backfill: %s", match.MatchId)
-				}
-			}
-
-			stats.Record(ctx, totalBytesPerMatch.M(int64(proto.Size(match))))
-			stats.Record(ctx, ticketsPerMatch.M(int64(len(match.GetTickets()))))
-			err = stream.Send(&pb.FetchMatchesResponse{Match: match})
+		if match, ok := m.Load(resp.GetMatchId()); ok {
+			telemetry.RecordUnitMeasurement(stream.Context(), mMatchesFetched)
+			err = stream.Send(&pb.FetchMatchesResponse{Match: match.(*pb.Match)})
 			if err != nil {
 				return fmt.Errorf("error sending match to caller of backend: %w", err)
 			}
@ -225,17 +195,17 @@ func callGrpcMmf(ctx context.Context, cc *rpc.ClientCache, profile *pb.MatchProf
 	var conn *grpc.ClientConn
 	conn, err := cc.GetGRPC(address)
 	if err != nil {
-		return status.Error(codes.InvalidArgument, "failed to establish grpc client connection to match function")
+		logger.WithFields(logrus.Fields{
+			"error":    err.Error(),
+			"function": address,
+		}).Error("failed to establish grpc client connection to match function")
+		return status.Error(codes.InvalidArgument, "failed to connect to match function")
 	}
 	client := pb.NewMatchFunctionClient(conn)

 	stream, err := client.Run(ctx, &pb.RunRequest{Profile: profile})
 	if err != nil {
-		err = errors.Wrap(err, "failed to run match function for profile")
-		if ctx.Err() != nil {
-			// gRPC likes to suppress the context's error, so stop that.
-			return ctx.Err()
-		}
+		logger.WithError(err).Error("failed to run match function for profile")
 		return err
 	}

@ -245,11 +215,7 @@ func callGrpcMmf(ctx context.Context, cc *rpc.ClientCache, profile *pb.MatchProf
 			break
 		}
 		if err != nil {
-			err = errors.Wrapf(err, "%v.Run() error, %v", client, err)
-			if ctx.Err() != nil {
-				// gRPC likes to suppress the context's error, so stop that.
-				return ctx.Err()
-			}
+			logger.Errorf("%v.Run() error, %v\n", client, err)
 			return err
 		}
 		select {
@ -265,8 +231,11 @@ func callGrpcMmf(ctx context.Context, cc *rpc.ClientCache, profile *pb.MatchProf
 func callHTTPMmf(ctx context.Context, cc *rpc.ClientCache, profile *pb.MatchProfile, address string, proposals chan<- *pb.Match) error {
 	client, baseURL, err := cc.GetHTTP(address)
 	if err != nil {
-		err = errors.Wrapf(err, "failed to establish rest client connection to match function: %s", address)
-		return status.Error(codes.InvalidArgument, err.Error())
+		logger.WithFields(logrus.Fields{
+			"error":    err.Error(),
+			"function": address,
+		}).Error("failed to establish rest client connection to match function")
+		return status.Error(codes.InvalidArgument, "failed to connect to match function")
 	}

 	var m jsonpb.Marshaler
@ -282,7 +251,7 @@ func callHTTPMmf(ctx context.Context, cc *rpc.ClientCache, profile *pb.MatchProf

 	resp, err := client.Do(req.WithContext(ctx))
 	if err != nil {
-		return status.Errorf(codes.Internal, "failed to get response from mmf run for profile %s: %s", profile.Name, err.Error())
+		return status.Errorf(codes.Internal, "failed to get response from mmf run for proile %s: %s", profile.Name, err.Error())
 	}
 	defer func() {
 		err = resp.Body.Close()
@ -323,119 +292,35 @@ func callHTTPMmf(ctx context.Context, cc *rpc.ClientCache, profile *pb.MatchProf
 }

 func (s *backendService) ReleaseTickets(ctx context.Context, req *pb.ReleaseTicketsRequest) (*pb.ReleaseTicketsResponse, error) {
-	err := doReleaseTickets(ctx, req.GetTicketIds(), s.store)
+	err := doReleasetickets(ctx, req, s.store)
 	if err != nil {
+		logger.WithError(err).Error("failed to remove the awaiting tickets from the ignore list for requested tickets")
 		return nil, err
 	}

+	telemetry.RecordNUnitMeasurement(ctx, mTicketsReleased, int64(len(req.TicketIds)))
 	return &pb.ReleaseTicketsResponse{}, nil
 }

-func doReleaseTickets(ctx context.Context, ticketIds []string, store statestore.Service) error {
-	err := store.DeleteTicketsFromPendingRelease(ctx, ticketIds)
-	if err != nil {
-		err = errors.Wrap(err, "failed to remove the awaiting tickets from the pending release for requested tickets")
-		return err
-	}
-
-	stats.Record(ctx, ticketsReleased.M(int64(len(ticketIds))))
-	return nil
-}
-
-func (s *backendService) ReleaseAllTickets(ctx context.Context, req *pb.ReleaseAllTicketsRequest) (*pb.ReleaseAllTicketsResponse, error) {
-	err := s.store.ReleaseAllTickets(ctx)
-	if err != nil {
-		return nil, err
-	}
-	return &pb.ReleaseAllTicketsResponse{}, nil
-}
-
 // AssignTickets overwrites the Assignment field of the input TicketIds.
 func (s *backendService) AssignTickets(ctx context.Context, req *pb.AssignTicketsRequest) (*pb.AssignTicketsResponse, error) {
-	resp, err := doAssignTickets(ctx, req, s.store)
+	err := doAssignTickets(ctx, req, s.store)
 	if err != nil {
+		logger.WithError(err).Error("failed to update assignments for requested tickets")
 		return nil, err
 	}

-	numIds := 0
-	for _, ag := range req.Assignments {
-		numIds += len(ag.TicketIds)
-	}
-
-	stats.Record(ctx, ticketsAssigned.M(int64(numIds)))
-	return resp, nil
+	telemetry.RecordNUnitMeasurement(ctx, mTicketsAssigned, int64(len(req.TicketIds)))
+	return &pb.AssignTicketsResponse{}, nil
 }

-func createOrUpdateBackfill(ctx context.Context, backfill *pb.Backfill, ticketIds []string, store statestore.Service) error {
-	if backfill.Id == "" {
-		backfill.Id = xid.New().String()
-		backfill.CreateTime = ptypes.TimestampNow()
-		backfill.Generation = 1
-		err := store.CreateBackfill(ctx, backfill, ticketIds)
-		if err != nil {
-			return err
-		}
-
-		return store.IndexBackfill(ctx, backfill)
-	}
-
-	m := store.NewMutex(backfill.Id)
-	err := m.Lock(ctx)
+func doAssignTickets(ctx context.Context, req *pb.AssignTicketsRequest, store statestore.Service) error {
+	err := store.UpdateAssignments(ctx, req.GetTicketIds(), req.GetAssignment())
 	if err != nil {
+		logger.WithError(err).Error("failed to update assignments")
 		return err
 	}
-
-	defer func() {
-		_, unlockErr := m.Unlock(ctx)
-		if unlockErr != nil {
-			logger.WithFields(logrus.Fields{"backfill_id": backfill.Id}).WithError(unlockErr).Error("failed to make unlock")
-		}
-	}()
-
-	b, ids, err := store.GetBackfill(ctx, backfill.Id)
-	if err != nil {
-		return err
-	}
-
-	if b.Generation != backfill.Generation {
-		logger.WithFields(logrus.Fields{"backfill_id": backfill.Id}).
-			WithError(errBackfillGenerationMismatch).
-			Errorf("failed to update backfill, expecting: %d generation but got: %d", b.Generation, backfill.Generation)
-		return errBackfillGenerationMismatch
-	}
-
-	b.SearchFields = backfill.SearchFields
-	b.Extensions = backfill.Extensions
-	b.Generation++
-
-	err = store.UpdateBackfill(ctx, b, append(ids, ticketIds...))
-	if err != nil {
-		return err
-	}
-
-	return store.IndexBackfill(ctx, b)
-}
-
-func doAssignTickets(ctx context.Context, req *pb.AssignTicketsRequest, store statestore.Service) (*pb.AssignTicketsResponse, error) {
-	resp, tickets, err := store.UpdateAssignments(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	for _, ticket := range tickets {
-		err = recordTimeToAssignment(ctx, ticket)
-		if err != nil {
-			logger.WithError(err).Errorf("failed to record time to assignment for ticket %s", ticket.Id)
-		}
-	}
-
-	ids := []string{}
-
-	for _, ag := range req.Assignments {
-		ids = append(ids, ag.TicketIds...)
-	}
-
-	for _, id := range ids {
+	for _, id := range req.GetTicketIds() {
 		err = store.DeindexTicket(ctx, id)
 		// Try to deindex all input tickets. Log without returning an error if the deindexing operation failed.
 		// TODO: consider retry the index operation
@ -444,27 +329,23 @@ func doAssignTickets(ctx context.Context, req *pb.AssignTicketsRequest, store st
 		}
 	}

-	if err = store.DeleteTicketsFromPendingRelease(ctx, ids); err != nil {
+	if err = store.DeleteTicketsFromIgnoreList(ctx, req.GetTicketIds()); err != nil {
 		logger.WithFields(logrus.Fields{
-			"ticket_ids": ids,
+			"ticket_ids": req.GetTicketIds(),
 		}).Error(err)
 	}

-	return resp, nil
+	return nil
 }

-func recordTimeToAssignment(ctx context.Context, ticket *pb.Ticket) error {
-	if ticket.Assignment == nil {
-		return fmt.Errorf("assignment for ticket %s is nil", ticket.Id)
-	}
-
-	now := time.Now()
-	created, err := ptypes.Timestamp(ticket.CreateTime)
+func doReleasetickets(ctx context.Context, req *pb.ReleaseTicketsRequest, store statestore.Service) error {
+	err := store.DeleteTicketsFromIgnoreList(ctx, req.GetTicketIds())
 	if err != nil {
+		logger.WithFields(logrus.Fields{
+			"ticket_ids": req.GetTicketIds(),
+		}).WithError(err).Error("failed to delete the tickets from the ignore list")
 		return err
 	}

-	stats.Record(ctx, ticketsTimeToAssignment.M(now.Sub(created).Milliseconds()))
-
 	return nil
 }
--- a/internal/app/backend/backend_service_test.go
+++ b/internal/app/backend/backend_service_test.go
@ -0,0 +1,309 @@
+// Copyright 2019 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package backend
+
+import (
+	"context"
+	"testing"
+
+	"github.com/spf13/viper"
+	"github.com/stretchr/testify/assert"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
+	"open-match.dev/open-match/internal/statestore"
+	statestoreTesting "open-match.dev/open-match/internal/statestore/testing"
+	utilTesting "open-match.dev/open-match/internal/util/testing"
+	"open-match.dev/open-match/pkg/pb"
+)
+
+func TestDoReleaseTickets(t *testing.T) {
+	fakeProperty := "test-property"
+	fakeTickets := []*pb.Ticket{
+		{
+			Id: "1",
+			SearchFields: &pb.SearchFields{
+				DoubleArgs: map[string]float64{
+					fakeProperty: 1,
+				},
+			},
+		},
+		{
+			Id: "2",
+			SearchFields: &pb.SearchFields{
+				DoubleArgs: map[string]float64{
+					fakeProperty: 2,
+				},
+			},
+		},
+		{
+			Id: "3",
+			SearchFields: &pb.SearchFields{
+				DoubleArgs: map[string]float64{
+					fakeProperty: 2,
+				},
+			},
+		},
+	}
+
+	tests := []struct {
+		description   string
+		preAction     func(context.Context, context.CancelFunc, statestore.Service, *pb.Pool)
+		req           *pb.ReleaseTicketsRequest
+		wantCode      codes.Code
+		pool          *pb.Pool
+		expectTickets []string
+	}{
+		{
+			description: "expect unavailable code since context is canceled before being called",
+			preAction: func(_ context.Context, cancel context.CancelFunc, _ statestore.Service, pool *pb.Pool) {
+				cancel()
+			},
+			req: &pb.ReleaseTicketsRequest{
+				TicketIds: []string{"1"},
+			},
+			wantCode: codes.Unavailable,
+		},
+		{
+			description:   "expect ok code when submitted list is empty",
+			pool:          &pb.Pool{DoubleRangeFilters: []*pb.DoubleRangeFilter{{DoubleArg: fakeProperty, Min: 0, Max: 3}}},
+			expectTickets: []string{"3"},
+			req: &pb.ReleaseTicketsRequest{
+				TicketIds: []string{},
+			},
+			preAction: func(ctx context.Context, cancel context.CancelFunc, store statestore.Service, pool *pb.Pool) {
+				for _, fakeTicket := range fakeTickets {
+					store.CreateTicket(ctx, fakeTicket)
+					store.IndexTicket(ctx, fakeTicket)
+				}
+
+				// Make sure tickets are correctly indexed.
+				var wantFilteredTickets []*pb.Ticket
+				err := store.FilterTickets(ctx, pool, 10, func(filterTickets []*pb.Ticket) error {
+					wantFilteredTickets = filterTickets
+					return nil
+				})
+				assert.Nil(t, err)
+				assert.Equal(t, len(fakeTickets), len(wantFilteredTickets))
+
+				// Ignore a few tickets
+				err = store.AddTicketsToIgnoreList(ctx, []string{"1", "2"})
+				assert.Nil(t, err)
+
+				// Make sure it was properly ignored
+				var ignoredFilterTickets []*pb.Ticket
+				err = store.FilterTickets(ctx, pool, 10, func(filterTickets []*pb.Ticket) error {
+					ignoredFilterTickets = filterTickets
+					return nil
+				})
+				assert.Nil(t, err)
+				assert.Equal(t, len(fakeTickets)-2, len(ignoredFilterTickets))
+			},
+			wantCode: codes.OK,
+		},
+		{
+			description:   "expect ok code",
+			pool:          &pb.Pool{DoubleRangeFilters: []*pb.DoubleRangeFilter{{DoubleArg: fakeProperty, Min: 0, Max: 3}}},
+			wantCode:      codes.OK,
+			expectTickets: []string{"1", "2"},
+			req: &pb.ReleaseTicketsRequest{
+				TicketIds: []string{"1", "2"},
+			},
+			preAction: func(ctx context.Context, cancel context.CancelFunc, store statestore.Service, pool *pb.Pool) {
+				for _, fakeTicket := range fakeTickets {
+					store.CreateTicket(ctx, fakeTicket)
+					store.IndexTicket(ctx, fakeTicket)
+				}
+				// Make sure tickets are correctly indexed.
+				var wantFilteredTickets []*pb.Ticket
+				err := store.FilterTickets(ctx, pool, 10, func(filterTickets []*pb.Ticket) error {
+					wantFilteredTickets = filterTickets
+					return nil
+				})
+				assert.Nil(t, err)
+				assert.Equal(t, len(fakeTickets), len(wantFilteredTickets))
+
+				// Ignore all the tickets
+				err = store.AddTicketsToIgnoreList(ctx, []string{"1", "2", "3"})
+				assert.Nil(t, err)
+
+				// Make sure it was properly ignored
+				var ignoredFilterTickets []*pb.Ticket
+				err = store.FilterTickets(ctx, pool, 10, func(filterTickets []*pb.Ticket) error {
+					ignoredFilterTickets = filterTickets
+					return nil
+				})
+				assert.Nil(t, err)
+				assert.Equal(t, len(fakeTickets)-3, len(ignoredFilterTickets))
+			},
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.description, func(t *testing.T) {
+			ctx, cancel := context.WithCancel(utilTesting.NewContext(t))
+			cfg := viper.New()
+			store, closer := statestoreTesting.NewStoreServiceForTesting(t, cfg)
+			defer closer()
+
+			test.preAction(ctx, cancel, store, test.pool)
+
+			err := doReleasetickets(ctx, test.req, store)
+			assert.Equal(t, test.wantCode, status.Convert(err).Code())
+
+			if err == nil {
+				// Make sure that the expected tickets are available for query
+				var filteredTickets []*pb.Ticket
+				err = store.FilterTickets(ctx, test.pool, 10, func(filterTickets []*pb.Ticket) error {
+					filteredTickets = filterTickets
+					return nil
+				})
+
+				assert.Nil(t, err)
+				assert.Equal(t, len(filteredTickets), len(test.expectTickets))
+
+				for _, ticket := range filteredTickets {
+					assert.Contains(t, test.expectTickets, ticket.GetId())
+				}
+			}
+		})
+	}
+}
+
+func TestDoAssignTickets(t *testing.T) {
+	fakeProperty := "test-property"
+	fakeTickets := []*pb.Ticket{
+		{
+			Id: "1",
+			SearchFields: &pb.SearchFields{
+				DoubleArgs: map[string]float64{
+					fakeProperty: 1,
+				},
+			},
+		},
+		{
+			Id: "2",
+			SearchFields: &pb.SearchFields{
+				DoubleArgs: map[string]float64{
+					fakeProperty: 2,
+				},
+			},
+		},
+	}
+
+	tests := []struct {
+		description    string
+		preAction      func(context.Context, context.CancelFunc, statestore.Service)
+		req            *pb.AssignTicketsRequest
+		wantCode       codes.Code
+		wantAssignment *pb.Assignment
+	}{
+		{
+			description: "expect unavailable code since context is canceled before being called",
+			preAction: func(_ context.Context, cancel context.CancelFunc, _ statestore.Service) {
+				cancel()
+			},
+			req: &pb.AssignTicketsRequest{
+				TicketIds:  []string{"1"},
+				Assignment: &pb.Assignment{},
+			},
+			wantCode: codes.Unavailable,
+		},
+		{
+			description: "expect invalid argument code since assignment is nil",
+			preAction: func(_ context.Context, cancel context.CancelFunc, _ statestore.Service) {
+				cancel()
+			},
+			req:      &pb.AssignTicketsRequest{},
+			wantCode: codes.InvalidArgument,
+		},
+		{
+			description: "expect not found code since ticket does not exist",
+			preAction:   func(_ context.Context, _ context.CancelFunc, _ statestore.Service) {},
+			req: &pb.AssignTicketsRequest{
+				TicketIds: []string{"1", "2"},
+				Assignment: &pb.Assignment{
+					Connection: "123",
+				},
+			},
+			wantCode: codes.NotFound,
+		},
+		{
+			description: "expect ok code",
+			preAction: func(ctx context.Context, cancel context.CancelFunc, store statestore.Service) {
+				for _, fakeTicket := range fakeTickets {
+					store.CreateTicket(ctx, fakeTicket)
+					store.IndexTicket(ctx, fakeTicket)
+				}
+				// Make sure tickets are correctly indexed.
+				var wantFilteredTickets []*pb.Ticket
+				pool := &pb.Pool{
+					DoubleRangeFilters: []*pb.DoubleRangeFilter{{DoubleArg: fakeProperty, Min: 0, Max: 3}},
+				}
+				err := store.FilterTickets(ctx, pool, 10, func(filterTickets []*pb.Ticket) error {
+					wantFilteredTickets = filterTickets
+					return nil
+				})
+				assert.Nil(t, err)
+				assert.Equal(t, len(fakeTickets), len(wantFilteredTickets))
+			},
+			req: &pb.AssignTicketsRequest{
+				TicketIds: []string{"1", "2"},
+				Assignment: &pb.Assignment{
+					Connection: "123",
+				},
+			},
+			wantCode: codes.OK,
+			wantAssignment: &pb.Assignment{
+				Connection: "123",
+			},
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(test.description, func(t *testing.T) {
+			ctx, cancel := context.WithCancel(utilTesting.NewContext(t))
+			cfg := viper.New()
+			store, closer := statestoreTesting.NewStoreServiceForTesting(t, cfg)
+			defer closer()
+
+			test.preAction(ctx, cancel, store)
+
+			err := doAssignTickets(ctx, test.req, store)
+
+			assert.Equal(t, test.wantCode, status.Convert(err).Code())
+
+			if err == nil {
+				for _, id := range test.req.GetTicketIds() {
+					ticket, err := store.GetTicket(ctx, id)
+					assert.Nil(t, err)
+					assert.Equal(t, test.wantAssignment, ticket.GetAssignment())
+				}
+
+				// Make sure tickets are deindexed after assignment
+				var wantFilteredTickets []*pb.Ticket
+				pool := &pb.Pool{
+					DoubleRangeFilters: []*pb.DoubleRangeFilter{{DoubleArg: fakeProperty, Min: 0, Max: 2}},
+				}
+				store.FilterTickets(ctx, pool, 10, func(filterTickets []*pb.Ticket) error {
+					wantFilteredTickets = filterTickets
+					return nil
+				})
+				assert.Nil(t, wantFilteredTickets)
+			}
+		})
+	}
+}
+
+// TODOs: add unit tests to doFetchMatchesFilterSkiplistIds and doFetchMatchesAddSkiplistIds
--- a/internal/app/evaluator/evaluator.go
+++ b/internal/app/evaluator/evaluator.go
@ -1,57 +0,0 @@
-// Copyright 2019 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package evaluator provides the Evaluator service for Open Match golang harness.
-package evaluator
-
-import (
-	"go.opencensus.io/stats"
-	"go.opencensus.io/stats/view"
-	"google.golang.org/grpc"
-	"open-match.dev/open-match/internal/appmain"
-	"open-match.dev/open-match/internal/telemetry"
-	"open-match.dev/open-match/pkg/pb"
-)
-
-var (
-	matchesPerEvaluateRequest  = stats.Int64("open-match.dev/evaluator/matches_per_request", "Number of matches sent to the evaluator per request", stats.UnitDimensionless)
-	matchesPerEvaluateResponse = stats.Int64("open-match.dev/evaluator/matches_per_response", "Number of matches returned by the evaluator per response", stats.UnitDimensionless)
-
-	matchesPerEvaluateRequestView = &view.View{
-		Measure:     matchesPerEvaluateRequest,
-		Name:        "open-match.dev/evaluator/matches_per_request",
-		Description: "Number of matches sent to the evaluator per request",
-		Aggregation: telemetry.DefaultCountDistribution,
-	}
-	matchesPerEvaluateResponseView = &view.View{
-		Measure:     matchesPerEvaluateResponse,
-		Name:        "open-match.dev/evaluator/matches_per_response",
-		Description: "Number of matches sent to the evaluator per response",
-		Aggregation: telemetry.DefaultCountDistribution,
-	}
-)
-
-// BindServiceFor creates the evaluator service and binds it to the serving harness.
-func BindServiceFor(eval Evaluator) appmain.Bind {
-	return func(p *appmain.Params, b *appmain.Bindings) error {
-		b.AddHandleFunc(func(s *grpc.Server) {
-			pb.RegisterEvaluatorServer(s, &evaluatorService{eval})
-		}, pb.RegisterEvaluatorHandlerFromEndpoint)
-		b.RegisterViews(
-			matchesPerEvaluateRequestView,
-			matchesPerEvaluateResponseView,
-		)
-		return nil
-	}
-}
--- a/internal/app/frontend/frontend.go
+++ b/internal/app/frontend/frontend.go
@ -15,63 +15,24 @@
 package frontend

 import (
-	"go.opencensus.io/stats"
-	"go.opencensus.io/stats/view"
 	"google.golang.org/grpc"
-	"open-match.dev/open-match/internal/appmain"
+	"open-match.dev/open-match/internal/config"
+	"open-match.dev/open-match/internal/rpc"
 	"open-match.dev/open-match/internal/statestore"
-	"open-match.dev/open-match/internal/telemetry"
 	"open-match.dev/open-match/pkg/pb"
 )

-var (
-	totalBytesPerTicket     = stats.Int64("open-match.dev/frontend/total_bytes_per_ticket", "Total bytes per ticket", stats.UnitBytes)
-	searchFieldsPerTicket   = stats.Int64("open-match.dev/frontend/searchfields_per_ticket", "Searchfields per ticket", stats.UnitDimensionless)
-	totalBytesPerBackfill   = stats.Int64("open-match.dev/frontend/total_bytes_per_backfill", "Total bytes per backfill", stats.UnitBytes)
-	searchFieldsPerBackfill = stats.Int64("open-match.dev/frontend/searchfields_per_backfill", "Searchfields per backfill", stats.UnitDimensionless)
-
-	totalBytesPerTicketView = &view.View{
-		Measure:     totalBytesPerTicket,
-		Name:        "open-match.dev/frontend/total_bytes_per_ticket",
-		Description: "Total bytes per ticket",
-		Aggregation: telemetry.DefaultBytesDistribution,
-	}
-	searchFieldsPerTicketView = &view.View{
-		Measure:     searchFieldsPerTicket,
-		Name:        "open-match.dev/frontend/searchfields_per_ticket",
-		Description: "SearchFields per ticket",
-		Aggregation: telemetry.DefaultCountDistribution,
-	}
-	totalBytesPerBackfillView = &view.View{
-		Measure:     totalBytesPerBackfill,
-		Name:        "open-match.dev/frontend/total_bytes_per_backfill",
-		Description: "Total bytes per backfill",
-		Aggregation: telemetry.DefaultBytesDistribution,
-	}
-	searchFieldsPerBackfillView = &view.View{
-		Measure:     searchFieldsPerBackfill,
-		Name:        "open-match.dev/frontend/searchfields_per_backfill",
-		Description: "SearchFields per backfill",
-		Aggregation: telemetry.DefaultCountDistribution,
-	}
-)
-
 // BindService creates the frontend service and binds it to the serving harness.
-func BindService(p *appmain.Params, b *appmain.Bindings) error {
+func BindService(p *rpc.ServerParams, cfg config.View) error {
 	service := &frontendService{
-		cfg:   p.Config(),
-		store: statestore.New(p.Config()),
+		cfg:   cfg,
+		store: statestore.New(cfg),
 	}

-	b.AddHealthCheckFunc(service.store.HealthCheck)
-	b.AddHandleFunc(func(s *grpc.Server) {
+	p.AddHealthCheckFunc(service.store.HealthCheck)
+	p.AddHandleFunc(func(s *grpc.Server) {
 		pb.RegisterFrontendServiceServer(s, service)
 	}, pb.RegisterFrontendServiceHandlerFromEndpoint)
-	b.RegisterViews(
-		totalBytesPerTicketView,
-		searchFieldsPerTicketView,
-		totalBytesPerBackfillView,
-		searchFieldsPerBackfillView,
-	)
+
 	return nil
 }
--- a/internal/app/frontend/frontend_service.go
+++ b/internal/app/frontend/frontend_service.go
@ -18,16 +18,14 @@ import (
 	"context"

 	"github.com/golang/protobuf/proto"
-	"github.com/golang/protobuf/ptypes"
-	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/rs/xid"
 	"github.com/sirupsen/logrus"
-	"go.opencensus.io/stats"
 	"go.opencensus.io/trace"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	"open-match.dev/open-match/internal/config"
 	"open-match.dev/open-match/internal/statestore"
+	"open-match.dev/open-match/internal/telemetry"
 	"open-match.dev/open-match/pkg/pb"
 )

@ -43,28 +41,26 @@ var (
 		"app":       "openmatch",
 		"component": "app.frontend",
 	})
+	mTicketsCreated             = telemetry.Counter("frontend/tickets_created", "tickets created")
+	mTicketsDeleted             = telemetry.Counter("frontend/tickets_deleted", "tickets deleted")
+	mTicketsRetrieved           = telemetry.Counter("frontend/tickets_retrieved", "tickets retrieved")
+	mTicketAssignmentsRetrieved = telemetry.Counter("frontend/tickets_assignments_retrieved", "ticket assignments retrieved")
 )

 // CreateTicket assigns an unique TicketId to the input Ticket and record it in state storage.
 // A ticket is considered as ready for matchmaking once it is created.
 //   - If a TicketId exists in a Ticket request, an auto-generated TicketId will override this field.
 //   - If SearchFields exist in a Ticket, CreateTicket will also index these fields such that one can query the ticket with query.QueryTickets function.
-func (s *frontendService) CreateTicket(ctx context.Context, req *pb.CreateTicketRequest) (*pb.Ticket, error) {
+func (s *frontendService) CreateTicket(ctx context.Context, req *pb.CreateTicketRequest) (*pb.CreateTicketResponse, error) {
 	// Perform input validation.
-	if req.Ticket == nil {
+	if req.GetTicket() == nil {
 		return nil, status.Errorf(codes.InvalidArgument, ".ticket is required")
 	}
-	if req.Ticket.Assignment != nil {
-		return nil, status.Errorf(codes.InvalidArgument, "tickets cannot be created with an assignment")
-	}
-	if req.Ticket.CreateTime != nil {
-		return nil, status.Errorf(codes.InvalidArgument, "tickets cannot be created with create time set")
-	}

 	return doCreateTicket(ctx, req, s.store)
 }

-func doCreateTicket(ctx context.Context, req *pb.CreateTicketRequest, store statestore.Service) (*pb.Ticket, error) {
+func doCreateTicket(ctx context.Context, req *pb.CreateTicketRequest, store statestore.Service) (*pb.CreateTicketResponse, error) {
 	// Generate a ticket id and create a Ticket in state storage
 	ticket, ok := proto.Clone(req.Ticket).(*pb.Ticket)
 	if !ok {
@ -72,174 +68,49 @@ func doCreateTicket(ctx context.Context, req *pb.CreateTicketRequest, store stat
 	}

 	ticket.Id = xid.New().String()
-	ticket.CreateTime = ptypes.TimestampNow()
-
-	sfCount := 0
-	sfCount += len(ticket.GetSearchFields().GetDoubleArgs())
-	sfCount += len(ticket.GetSearchFields().GetStringArgs())
-	sfCount += len(ticket.GetSearchFields().GetTags())
-	stats.Record(ctx, searchFieldsPerTicket.M(int64(sfCount)))
-	stats.Record(ctx, totalBytesPerTicket.M(int64(proto.Size(ticket))))
-
 	err := store.CreateTicket(ctx, ticket)
 	if err != nil {
+		logger.WithFields(logrus.Fields{
+			"error":  err.Error(),
+			"ticket": ticket,
+		}).Error("failed to create the ticket")
 		return nil, err
 	}

 	err = store.IndexTicket(ctx, ticket)
-	if err != nil {
-		return nil, err
-	}
-
-	return ticket, nil
-}
-
-// CreateBackfill creates a new Backfill object.
-// it assigns an unique Id to the input Backfill and record it in state storage.
-// Set initial LastAcknowledge time for this Backfill.
-// A Backfill is considered as ready for matchmaking once it is created.
-//   - If SearchFields exist in a Backfill, CreateBackfill will also index these fields such that one can query the ticket with query.QueryBackfills function.
-func (s *frontendService) CreateBackfill(ctx context.Context, req *pb.CreateBackfillRequest) (*pb.Backfill, error) {
-	// Perform input validation.
-	if req == nil {
-		return nil, status.Errorf(codes.InvalidArgument, "request is nil")
-	}
-	if req.Backfill == nil {
-		return nil, status.Errorf(codes.InvalidArgument, ".backfill is required")
-	}
-	if req.Backfill.CreateTime != nil {
-		return nil, status.Errorf(codes.InvalidArgument, "backfills cannot be created with create time set")
-	}
-
-	return doCreateBackfill(ctx, req, s.store)
-}
-
-func doCreateBackfill(ctx context.Context, req *pb.CreateBackfillRequest, store statestore.Service) (*pb.Backfill, error) {
-	// Generate an id and create a Backfill in state storage
-	backfill, ok := proto.Clone(req.Backfill).(*pb.Backfill)
-	if !ok {
-		return nil, status.Error(codes.Internal, "failed to clone input ticket proto")
-	}
-
-	backfill.Id = xid.New().String()
-	backfill.CreateTime = ptypes.TimestampNow()
-	backfill.Generation = 1
-
-	sfCount := 0
-	sfCount += len(backfill.GetSearchFields().GetDoubleArgs())
-	sfCount += len(backfill.GetSearchFields().GetStringArgs())
-	sfCount += len(backfill.GetSearchFields().GetTags())
-	stats.Record(ctx, searchFieldsPerBackfill.M(int64(sfCount)))
-	stats.Record(ctx, totalBytesPerBackfill.M(int64(proto.Size(backfill))))
-
-	err := store.CreateBackfill(ctx, backfill, []string{})
-	if err != nil {
-		return nil, err
-	}
-	err = store.IndexBackfill(ctx, backfill)
-	if err != nil {
-		return nil, err
-	}
-	return backfill, nil
-}
-
-// UpdateBackfill updates a Backfill object, if present.
-// Update would increment generation in Redis.
-// Only Extensions and SearchFields would be updated.
-// CreateTime is not changed on Update
-func (s *frontendService) UpdateBackfill(ctx context.Context, req *pb.UpdateBackfillRequest) (*pb.Backfill, error) {
-	if req == nil {
-		return nil, status.Errorf(codes.InvalidArgument, "request is nil")
-	}
-	if req.Backfill == nil {
-		return nil, status.Errorf(codes.InvalidArgument, ".backfill is required")
-	}
-
-	backfill, ok := proto.Clone(req.Backfill).(*pb.Backfill)
-	if !ok {
-		return nil, status.Error(codes.Internal, "failed to clone input backfill proto")
-	}
-
-	bfID := backfill.Id
-	if bfID == "" {
-		return nil, status.Error(codes.InvalidArgument, "backfill ID should exist")
-	}
-	m := s.store.NewMutex(bfID)
-
-	err := m.Lock(ctx)
-	if err != nil {
-		return nil, err
-	}
-	defer func() {
-		if _, err = m.Unlock(ctx); err != nil {
-			logger.WithError(err).Error("error on mutex unlock")
-		}
-	}()
-	bfStored, associatedTickets, err := s.store.GetBackfill(ctx, bfID)
-	if err != nil {
-		return nil, err
-	}
-
-	// Update generation here, because Frontend is used by GameServer only
-	bfStored.SearchFields = backfill.SearchFields
-	bfStored.Extensions = backfill.Extensions
-	// Autoincrement generation, input backfill generation validation is performed
-	// on Backend only (after MMF round)
-	bfStored.Generation++
-	err = s.store.UpdateBackfill(ctx, bfStored, []string{})
-	if err != nil {
-		return nil, err
-	}
-
-	err = s.store.DeleteTicketsFromPendingRelease(ctx, associatedTickets)
-	if err != nil {
-		return nil, err
-	}
-
-	err = s.store.IndexBackfill(ctx, bfStored)
 	if err != nil {
 		logger.WithFields(logrus.Fields{
-			"error": err.Error(),
-			"id":    bfStored.Id,
-		}).Error("failed to index the backfill")
+			"error":  err.Error(),
+			"ticket": ticket,
+		}).Error("failed to index the ticket")
 		return nil, err
 	}
-	return bfStored, nil
-}

-// DeleteBackfill deletes a Backfill by its ID.
-func (s *frontendService) DeleteBackfill(ctx context.Context, req *pb.DeleteBackfillRequest) (*empty.Empty, error) {
-	bfID := req.GetBackfillId()
-	if bfID == "" {
-		return nil, status.Errorf(codes.InvalidArgument, ".BackfillId is required")
-	}
-
-	err := s.store.DeleteBackfillCompletely(ctx, bfID)
-	// Deleting of Backfill is inevitable when it is expired, so we don't worry about error here
-	if err != nil {
-		logger.WithFields(logrus.Fields{
-			"error": err.Error(),
-		}).Error("error on DeleteBackfill")
-	}
-	return &empty.Empty{}, nil
+	telemetry.RecordUnitMeasurement(ctx, mTicketsCreated)
+	return &pb.CreateTicketResponse{Ticket: ticket}, nil
 }

 // DeleteTicket immediately stops Open Match from using the Ticket for matchmaking and removes the Ticket from state storage.
 // The client must delete the Ticket when finished matchmaking with it.
 //   - If SearchFields exist in a Ticket, DeleteTicket will deindex the fields lazily.
 // Users may still be able to assign/get a ticket after calling DeleteTicket on it.
-func (s *frontendService) DeleteTicket(ctx context.Context, req *pb.DeleteTicketRequest) (*empty.Empty, error) {
+func (s *frontendService) DeleteTicket(ctx context.Context, req *pb.DeleteTicketRequest) (*pb.DeleteTicketResponse, error) {
 	err := doDeleteTicket(ctx, req.GetTicketId(), s.store)
 	if err != nil {
 		return nil, err
 	}
-	return &empty.Empty{}, nil
+	telemetry.RecordUnitMeasurement(ctx, mTicketsDeleted)
+	return &pb.DeleteTicketResponse{}, nil
 }

 func doDeleteTicket(ctx context.Context, id string, store statestore.Service) error {
 	// Deindex this Ticket to remove it from matchmaking pool.
 	err := store.DeindexTicket(ctx, id)
 	if err != nil {
+		logger.WithFields(logrus.Fields{
+			"error": err.Error(),
+			"id":    id,
+		}).Error("failed to deindex the ticket")
 		return err
 	}

@ -255,12 +126,12 @@ func doDeleteTicket(ctx context.Context, id string, store statestore.Service) er
 				"id":    id,
 			}).Error("failed to delete the ticket")
 		}
-		err = store.DeleteTicketsFromPendingRelease(ctx, []string{id})
+		err = store.DeleteTicketsFromIgnoreList(ctx, []string{id})
 		if err != nil {
 			logger.WithFields(logrus.Fields{
 				"error": err.Error(),
 				"id":    id,
-			}).Error("failed to delete the ticket from pendingRelease")
+			}).Error("failed to delete the ticket from ignorelist")
 		}
 		// TODO: If other redis queues are implemented or we have custom index fields
 		// created by Open Match, those need to be cleaned up here.
@ -270,12 +141,26 @@ func doDeleteTicket(ctx context.Context, id string, store statestore.Service) er

 // GetTicket get the Ticket associated with the specified TicketId.
 func (s *frontendService) GetTicket(ctx context.Context, req *pb.GetTicketRequest) (*pb.Ticket, error) {
-	return s.store.GetTicket(ctx, req.GetTicketId())
+	telemetry.RecordUnitMeasurement(ctx, mTicketsRetrieved)
+	return doGetTickets(ctx, req.GetTicketId(), s.store)
 }

-// WatchAssignments stream back Assignment of the specified TicketId if it is updated.
+func doGetTickets(ctx context.Context, id string, store statestore.Service) (*pb.Ticket, error) {
+	ticket, err := store.GetTicket(ctx, id)
+	if err != nil {
+		logger.WithFields(logrus.Fields{
+			"error": err.Error(),
+			"id":    id,
+		}).Error("failed to get the ticket")
+		return nil, err
+	}
+
+	return ticket, nil
+}
+
+// GetAssignments stream back Assignment of the specified TicketId if it is updated.
 //   - If the Assignment is not updated, GetAssignment will retry using the configured backoff strategy.
-func (s *frontendService) WatchAssignments(req *pb.WatchAssignmentsRequest, stream pb.FrontendService_WatchAssignmentsServer) error {
+func (s *frontendService) GetAssignments(req *pb.GetAssignmentsRequest, stream pb.FrontendService_GetAssignmentsServer) error {
 	ctx := stream.Context()
 	for {
 		select {
@ -283,21 +168,18 @@ func (s *frontendService) WatchAssignments(req *pb.WatchAssignmentsRequest, stre
 			return ctx.Err()
 		default:
 			sender := func(assignment *pb.Assignment) error {
-				return stream.Send(&pb.WatchAssignmentsResponse{Assignment: assignment})
+				telemetry.RecordUnitMeasurement(ctx, mTicketAssignmentsRetrieved)
+				return stream.Send(&pb.GetAssignmentsResponse{Assignment: assignment})
 			}
-			return doWatchAssignments(ctx, req.GetTicketId(), sender, s.store)
+			return doGetAssignments(ctx, req.GetTicketId(), sender, s.store)
 		}
 	}
 }

-func doWatchAssignments(ctx context.Context, id string, sender func(*pb.Assignment) error, store statestore.Service) error {
+func doGetAssignments(ctx context.Context, id string, sender func(*pb.Assignment) error, store statestore.Service) error {
 	var currAssignment *pb.Assignment
 	var ok bool
 	callback := func(assignment *pb.Assignment) error {
-		if ctx.Err() != nil {
-			return status.Errorf(codes.Aborted, ctx.Err().Error())
-		}
-
 		if (currAssignment == nil && assignment != nil) || !proto.Equal(currAssignment, assignment) {
 			currAssignment, ok = proto.Clone(assignment).(*pb.Assignment)
 			if !ok {
@ -306,6 +188,7 @@ func doWatchAssignments(ctx context.Context, id string, sender func(*pb.Assignme

 			err := sender(currAssignment)
 			if err != nil {
+				logger.WithError(err).Error("failed to send Redis response to grpc server")
 				return status.Errorf(codes.Aborted, err.Error())
 			}
 		}
@ -314,78 +197,3 @@ func doWatchAssignments(ctx context.Context, id string, sender func(*pb.Assignme

 	return store.GetAssignments(ctx, id, callback)
 }
-
-// AcknowledgeBackfill is used to notify OpenMatch about GameServer connection info.
-// This triggers an assignment process.
-func (s *frontendService) AcknowledgeBackfill(ctx context.Context, req *pb.AcknowledgeBackfillRequest) (*pb.AcknowledgeBackfillResponse, error) {
-	if req.GetBackfillId() == "" {
-		return nil, status.Errorf(codes.InvalidArgument, ".BackfillId is required")
-	}
-	if req.GetAssignment() == nil {
-		return nil, status.Errorf(codes.InvalidArgument, ".Assignment is required")
-	}
-
-	m := s.store.NewMutex(req.GetBackfillId())
-
-	err := m.Lock(ctx)
-	if err != nil {
-		return nil, err
-	}
-	defer func() {
-		if _, err = m.Unlock(ctx); err != nil {
-			logger.WithError(err).Error("error on mutex unlock")
-		}
-	}()
-
-	bf, associatedTickets, err := s.store.GetBackfill(ctx, req.GetBackfillId())
-	if err != nil {
-		return nil, err
-	}
-
-	err = s.store.UpdateAcknowledgmentTimestamp(ctx, req.GetBackfillId())
-	if err != nil {
-		return nil, err
-	}
-
-	resp := &pb.AcknowledgeBackfillResponse{
-		Backfill: bf,
-		Tickets:  make([]*pb.Ticket, 0),
-	}
-
-	if len(associatedTickets) != 0 {
-		setResp, tickets, err := s.store.UpdateAssignments(ctx, &pb.AssignTicketsRequest{
-			Assignments: []*pb.AssignmentGroup{{TicketIds: associatedTickets, Assignment: req.GetAssignment()}},
-		})
-		if err != nil {
-			return nil, err
-		}
-
-		resp.Tickets = tickets
-
-		// log errors returned from UpdateAssignments to track tickets with NotFound errors
-		for _, f := range setResp.Failures {
-			logger.Errorf("failed to assign ticket %s, cause %d", f.TicketId, f.Cause)
-		}
-		for _, id := range associatedTickets {
-			err = s.store.DeindexTicket(ctx, id)
-			// Try to deindex all input tickets. Log without returning an error if the deindexing operation failed.
-			if err != nil {
-				logger.WithError(err).Errorf("failed to deindex ticket %s after updating the assignments", id)
-			}
-		}
-
-		// Remove all tickets associated with backfill, because unassigned tickets are not found only
-		err = s.store.UpdateBackfill(ctx, bf, []string{})
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return resp, nil
-}
-
-// GetBackfill fetches a Backfill object by its ID.
-func (s *frontendService) GetBackfill(ctx context.Context, req *pb.GetBackfillRequest) (*pb.Backfill, error) {
-	bf, _, err := s.store.GetBackfill(ctx, req.GetBackfillId())
-	return bf, err
-}
--- a/internal/app/frontend/frontend_service_test.go
+++ b/internal/app/frontend/frontend_service_test.go
@ -22,9 +22,8 @@ import (
 	"testing"
 	"time"

-	"github.com/golang/protobuf/ptypes"
 	"github.com/spf13/viper"
-	"github.com/stretchr/testify/require"
+	"github.com/stretchr/testify/assert"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	"open-match.dev/open-match/internal/statestore"
@ -69,7 +68,6 @@ func TestDoCreateTickets(t *testing.T) {
 	}

 	for _, test := range tests {
-		test := test
 		t.Run(test.description, func(t *testing.T) {
 			store, closer := statestoreTesting.NewStoreServiceForTesting(t, cfg)
 			defer closer()
@ -78,195 +76,18 @@ func TestDoCreateTickets(t *testing.T) {
 			test.preAction(cancel)

 			res, err := doCreateTicket(ctx, &pb.CreateTicketRequest{Ticket: test.ticket}, store)
-			require.Equal(t, test.wantCode.String(), status.Convert(err).Code().String())
+			assert.Equal(t, test.wantCode, status.Convert(err).Code())
 			if err == nil {
-				matched, err := regexp.MatchString(`[0-9a-v]{20}`, res.GetId())
-				require.True(t, matched)
-				require.NoError(t, err)
-				require.Equal(t, test.ticket.SearchFields.DoubleArgs["test-arg"], res.SearchFields.DoubleArgs["test-arg"])
+				matched, err := regexp.MatchString(`[0-9a-v]{20}`, res.GetTicket().GetId())
+				assert.True(t, matched)
+				assert.Nil(t, err)
+				assert.Equal(t, test.ticket.SearchFields.DoubleArgs["test-arg"], res.Ticket.SearchFields.DoubleArgs["test-arg"])
 			}
 		})
 	}
 }

-func TestCreateBackfill(t *testing.T) {
-	cfg := viper.New()
-	store, closer := statestoreTesting.NewStoreServiceForTesting(t, cfg)
-	defer closer()
-	ctx := utilTesting.NewContext(t)
-	fs := frontendService{cfg, store}
-	var testCases = []struct {
-		description     string
-		request         *pb.CreateBackfillRequest
-		result          *pb.Backfill
-		expectedCode    codes.Code
-		expectedMessage string
-	}{
-		{
-			description:     "nil request check",
-			request:         nil,
-			expectedCode:    codes.InvalidArgument,
-			expectedMessage: "request is nil",
-		},
-		{
-			description:     "nil backfill - error is returned",
-			request:         &pb.CreateBackfillRequest{Backfill: nil},
-			expectedCode:    codes.InvalidArgument,
-			expectedMessage: ".backfill is required",
-		},
-		{
-			description:     "createTime should not exist in input",
-			request:         &pb.CreateBackfillRequest{Backfill: &pb.Backfill{CreateTime: ptypes.TimestampNow()}},
-			expectedCode:    codes.InvalidArgument,
-			expectedMessage: "backfills cannot be created with create time set",
-		},
-		{
-			description:     "empty Backfill, no errors",
-			request:         &pb.CreateBackfillRequest{Backfill: &pb.Backfill{}},
-			expectedCode:    codes.OK,
-			expectedMessage: "",
-		},
-		{
-			description: "normal backfill",
-			request: &pb.CreateBackfillRequest{
-				Backfill: &pb.Backfill{
-					SearchFields: &pb.SearchFields{
-						StringArgs: map[string]string{
-							"search": "me",
-						}}}},
-			expectedCode:    codes.OK,
-			expectedMessage: "",
-		},
-	}
-
-	for _, tc := range testCases {
-		tc := tc
-		t.Run(tc.description, func(t *testing.T) {
-			res, err := fs.CreateBackfill(ctx, tc.request)
-			if tc.expectedCode == codes.OK {
-				require.NoError(t, err)
-				require.NotNil(t, res)
-			} else {
-				require.Error(t, err)
-				require.Equal(t, tc.expectedCode.String(), status.Convert(err).Code().String())
-				require.Contains(t, status.Convert(err).Message(), tc.expectedMessage)
-			}
-		})
-	}
-
-	// expect error with canceled context
-	store, closer = statestoreTesting.NewStoreServiceForTesting(t, cfg)
-	defer closer()
-	fs = frontendService{cfg, store}
-	ctx, cancel := context.WithCancel(context.Background())
-	cancel()
-
-	res, err := fs.CreateBackfill(ctx, &pb.CreateBackfillRequest{Backfill: &pb.Backfill{
-		SearchFields: &pb.SearchFields{
-			DoubleArgs: map[string]float64{
-				"test-arg": 1,
-			},
-		},
-	}})
-	require.NotNil(t, err)
-	require.Equal(t, codes.Unavailable.String(), status.Convert(err).Code().String())
-	require.Nil(t, res)
-}
-
-func TestUpdateBackfill(t *testing.T) {
-	cfg := viper.New()
-	store, closer := statestoreTesting.NewStoreServiceForTesting(t, cfg)
-	defer closer()
-	ctx := utilTesting.NewContext(t)
-	fs := frontendService{cfg, store}
-	res, err := fs.CreateBackfill(ctx, &pb.CreateBackfillRequest{
-		Backfill: &pb.Backfill{
-			SearchFields: &pb.SearchFields{
-				StringArgs: map[string]string{
-					"search": "me",
-				},
-			},
-		},
-	})
-	require.NoError(t, err)
-	require.NotNil(t, res)
-
-	var testCases = []struct {
-		description     string
-		request         *pb.UpdateBackfillRequest
-		result          *pb.Backfill
-		expectedCode    codes.Code
-		expectedMessage string
-	}{
-		{
-			description:     "nil request check",
-			request:         nil,
-			expectedCode:    codes.InvalidArgument,
-			expectedMessage: "request is nil",
-		},
-		{
-			description:     "nil backfill - error is returned",
-			request:         &pb.UpdateBackfillRequest{Backfill: nil},
-			expectedCode:    codes.InvalidArgument,
-			expectedMessage: ".backfill is required",
-		},
-		{
-			description:     "empty Backfill, error with no backfill ID",
-			request:         &pb.UpdateBackfillRequest{Backfill: &pb.Backfill{}},
-			expectedCode:    codes.InvalidArgument,
-			expectedMessage: "backfill ID should exist",
-		},
-		{
-			description: "normal backfill",
-			request: &pb.UpdateBackfillRequest{
-				Backfill: &pb.Backfill{
-					Id: res.Id,
-					SearchFields: &pb.SearchFields{
-						StringArgs: map[string]string{
-							"search": "me",
-						}}}},
-			expectedCode:    codes.OK,
-			expectedMessage: "",
-		},
-	}
-
-	for _, tc := range testCases {
-		tc := tc
-		t.Run(tc.description, func(t *testing.T) {
-			res, err = fs.UpdateBackfill(ctx, tc.request)
-			if tc.expectedCode == codes.OK {
-				require.NoError(t, err)
-				require.NotNil(t, res)
-				require.Equal(t, tc.request.Backfill.SearchFields.DoubleArgs, res.SearchFields.DoubleArgs)
-			} else {
-				require.Error(t, err)
-				require.Equal(t, tc.expectedCode.String(), status.Convert(err).Code().String())
-				require.Contains(t, status.Convert(err).Message(), tc.expectedMessage)
-			}
-		})
-	}
-
-	// expect error with canceled context
-	store, closer = statestoreTesting.NewStoreServiceForTesting(t, cfg)
-	fs = frontendService{cfg, store}
-	defer closer()
-	ctx, cancel := context.WithCancel(context.Background())
-	cancel()
-
-	res, err = fs.UpdateBackfill(ctx, &pb.UpdateBackfillRequest{Backfill: &pb.Backfill{
-		Id: res.Id,
-		SearchFields: &pb.SearchFields{
-			DoubleArgs: map[string]float64{
-				"test-arg": 1,
-			},
-		},
-	}})
-	require.NotNil(t, err)
-	require.Equal(t, codes.Unknown.String(), status.Convert(err).Code().String())
-	require.Nil(t, res)
-}
-
-func TestDoWatchAssignments(t *testing.T) {
+func TestDoGetAssignments(t *testing.T) {
 	testTicket := &pb.Ticket{
 		Id: "test-id",
 	}
@ -296,20 +117,12 @@ func TestDoWatchAssignments(t *testing.T) {
 		{
 			description: "expect two assignment reads from preAction writes and fail in grpc aborted code",
 			preAction: func(ctx context.Context, t *testing.T, store statestore.Service, wantAssignments []*pb.Assignment, wg *sync.WaitGroup) {
-				require.Nil(t, store.CreateTicket(ctx, testTicket))
+				assert.Nil(t, store.CreateTicket(ctx, testTicket))

 				go func(wg *sync.WaitGroup) {
 					for i := 0; i < len(wantAssignments); i++ {
 						time.Sleep(50 * time.Millisecond)
-						_, _, err := store.UpdateAssignments(ctx, &pb.AssignTicketsRequest{
-							Assignments: []*pb.AssignmentGroup{
-								{
-									TicketIds:  []string{testTicket.GetId()},
-									Assignment: wantAssignments[i],
-								},
-							},
-						})
-						require.NoError(t, err)
+						assert.Nil(t, store.UpdateAssignments(ctx, []string{testTicket.GetId()}, wantAssignments[i]))
 						wg.Done()
 					}
 				}(wg)
@ -332,100 +145,17 @@ func TestDoWatchAssignments(t *testing.T) {
 			gotAssignments := []*pb.Assignment{}

 			test.preAction(ctx, t, store, test.wantAssignments, &wg)
-			err := doWatchAssignments(ctx, testTicket.GetId(), senderGenerator(gotAssignments, len(test.wantAssignments)), store)
-			require.Equal(t, test.wantCode.String(), status.Convert(err).Code().String())
+			err := doGetAssignments(ctx, testTicket.GetId(), senderGenerator(gotAssignments, len(test.wantAssignments)), store)
+			assert.Equal(t, test.wantCode, status.Convert(err).Code())

 			wg.Wait()
 			for i := 0; i < len(gotAssignments); i++ {
-				require.Equal(t, gotAssignments[i], test.wantAssignments[i])
+				assert.Equal(t, gotAssignments[i], test.wantAssignments[i])
 			}
 		})
 	}
 }

-// TestAcknowledgeBackfillValidation - test input validation only
-func TestAcknowledgeBackfillValidation(t *testing.T) {
-	cfg := viper.New()
-	tests := []struct {
-		description     string
-		request         *pb.AcknowledgeBackfillRequest
-		expectedMessage string
-	}{
-		{
-			description:     "no BackfillId, error is expected",
-			request:         &pb.AcknowledgeBackfillRequest{BackfillId: "", Assignment: &pb.Assignment{Connection: "10.0.0.1"}},
-			expectedMessage: ".BackfillId is required",
-		},
-		{
-			description:     "no Assignment, error is expected",
-			request:         &pb.AcknowledgeBackfillRequest{BackfillId: "1234", Assignment: nil},
-			expectedMessage: ".Assignment is required",
-		},
-	}
-
-	for _, test := range tests {
-		test := test
-		t.Run(test.description, func(t *testing.T) {
-			ctx := context.Background()
-
-			store, closer := statestoreTesting.NewStoreServiceForTesting(t, cfg)
-			defer closer()
-			fs := frontendService{cfg, store}
-			bf, err := fs.AcknowledgeBackfill(ctx, test.request)
-			require.Equal(t, codes.InvalidArgument.String(), status.Convert(err).Code().String())
-			require.Equal(t, test.expectedMessage, status.Convert(err).Message())
-			require.Nil(t, bf)
-		})
-	}
-}
-
-// TestAcknowledgeBackfill verifies timestamp part of AcknowledgeBackfill call,
-// assignment part tested in a corresponding E2E test.
-// Expired backfill can not be acknowledged
-func TestAcknowledgeBackfill(t *testing.T) {
-	cfg := viper.New()
-	ctx := context.Background()
-
-	store, closer := statestoreTesting.NewStoreServiceForTesting(t, cfg)
-	defer closer()
-
-	fakeBackfill := &pb.Backfill{
-		Id: "1",
-		SearchFields: &pb.SearchFields{
-			DoubleArgs: map[string]float64{
-				"test-arg": 1,
-			},
-		},
-	}
-	err := store.CreateBackfill(ctx, fakeBackfill, []string{})
-	require.NoError(t, err)
-	fs := frontendService{cfg, store}
-
-	resp, err := fs.AcknowledgeBackfill(ctx, &pb.AcknowledgeBackfillRequest{BackfillId: fakeBackfill.Id, Assignment: &pb.Assignment{Connection: "10.0.0.1"}})
-	require.NoError(t, err)
-	require.NotNil(t, resp)
-	require.NotNil(t, resp.Backfill)
-	require.NotNil(t, resp.Tickets)
-
-	// Use wrong BackfillID, error is returned
-	resp, err = fs.AcknowledgeBackfill(ctx, &pb.AcknowledgeBackfillRequest{BackfillId: "42", Assignment: &pb.Assignment{Connection: "10.0.0.1"}})
-	require.Error(t, err)
-	require.Nil(t, resp)
-	require.Equal(t, "Backfill id: 42 not found", status.Convert(err).Message())
-
-	time.Sleep(cfg.GetDuration("pendingReleaseTimeout"))
-	ids, err := store.GetExpiredBackfillIDs(ctx)
-	require.NoError(t, err)
-	require.Len(t, ids, 1)
-
-	resp, err = fs.AcknowledgeBackfill(ctx, &pb.AcknowledgeBackfillRequest{BackfillId: fakeBackfill.Id, Assignment: &pb.Assignment{Connection: "10.0.0.1"}})
-	require.Nil(t, resp)
-	require.Error(t, err)
-	require.Equal(t, codes.Unavailable.String(), status.Convert(err).Code().String())
-	require.Contains(t, status.Convert(err).Message(), "can not acknowledge an expired backfill, id: 1")
-
-}
-
 func TestDoDeleteTicket(t *testing.T) {
 	fakeTicket := &pb.Ticket{
 		Id: "1",
@ -463,7 +193,6 @@ func TestDoDeleteTicket(t *testing.T) {
 	}

 	for _, test := range tests {
-		test := test
 		t.Run(test.description, func(t *testing.T) {
 			ctx, cancel := context.WithCancel(utilTesting.NewContext(t))
 			store, closer := statestoreTesting.NewStoreServiceForTesting(t, viper.New())
@ -472,7 +201,7 @@ func TestDoDeleteTicket(t *testing.T) {
 			test.preAction(ctx, cancel, store)

 			err := doDeleteTicket(ctx, fakeTicket.GetId(), store)
-			require.Equal(t, test.wantCode.String(), status.Convert(err).Code().String())
+			assert.Equal(t, test.wantCode, status.Convert(err).Code())
 		})
 	}
 }
@ -517,7 +246,6 @@ func TestDoGetTicket(t *testing.T) {
 	}

 	for _, test := range tests {
-		test := test
 		t.Run(test.description, func(t *testing.T) {
 			ctx, cancel := context.WithCancel(utilTesting.NewContext(t))
 			store, closer := statestoreTesting.NewStoreServiceForTesting(t, viper.New())
@ -525,119 +253,13 @@ func TestDoGetTicket(t *testing.T) {

 			test.preAction(ctx, cancel, store)

-			ticket, err := store.GetTicket(ctx, fakeTicket.GetId())
-			require.Equal(t, test.wantCode.String(), status.Convert(err).Code().String())
+			ticket, err := doGetTickets(ctx, fakeTicket.GetId(), store)
+			assert.Equal(t, test.wantCode, status.Convert(err).Code())

 			if err == nil {
-				require.Equal(t, test.wantTicket.GetId(), ticket.GetId())
-				require.Equal(t, test.wantTicket.SearchFields.DoubleArgs, ticket.SearchFields.DoubleArgs)
+				assert.Equal(t, test.wantTicket.GetId(), ticket.GetId())
+				assert.Equal(t, test.wantTicket.SearchFields.DoubleArgs, ticket.SearchFields.DoubleArgs)
 			}
 		})
 	}
 }
-
-func TestGetBackfill(t *testing.T) {
-	fakeBackfill := &pb.Backfill{
-		Id: "1",
-		SearchFields: &pb.SearchFields{
-			DoubleArgs: map[string]float64{
-				"test-arg": 1,
-			},
-		},
-	}
-	cfg := viper.New()
-	tests := []struct {
-		description string
-		preAction   func(context.Context, context.CancelFunc, statestore.Service)
-		wantTicket  *pb.Backfill
-		wantCode    codes.Code
-	}{
-		{
-			description: "expect unavailable code since context is canceled before being called",
-			preAction: func(_ context.Context, cancel context.CancelFunc, _ statestore.Service) {
-				cancel()
-			},
-			wantCode: codes.Unavailable,
-		},
-		{
-			description: "expect not found code since ticket does not exist",
-			preAction:   func(_ context.Context, _ context.CancelFunc, _ statestore.Service) {},
-			wantCode:    codes.NotFound,
-		},
-		{
-			description: "expect ok code with output ticket equivalent to fakeBackfill",
-			preAction: func(ctx context.Context, _ context.CancelFunc, store statestore.Service) {
-				store.CreateBackfill(ctx, fakeBackfill, []string{})
-			},
-			wantCode:   codes.OK,
-			wantTicket: fakeBackfill,
-		},
-	}
-
-	for _, test := range tests {
-		test := test
-		t.Run(test.description, func(t *testing.T) {
-			ctx, cancel := context.WithCancel(utilTesting.NewContext(t))
-			store, closer := statestoreTesting.NewStoreServiceForTesting(t, viper.New())
-			defer closer()
-			fs := frontendService{cfg, store}
-
-			test.preAction(ctx, cancel, store)
-
-			backfill, err := fs.GetBackfill(ctx, &pb.GetBackfillRequest{BackfillId: fakeBackfill.GetId()})
-			require.Equal(t, test.wantCode.String(), status.Convert(err).Code().String())
-
-			if err == nil {
-				require.Equal(t, test.wantTicket.GetId(), backfill.GetId())
-				require.Equal(t, test.wantTicket.SearchFields.DoubleArgs, backfill.SearchFields.DoubleArgs)
-			}
-		})
-	}
-}
-
-func TestDoDeleteBackfill(t *testing.T) {
-	fakeBackfill := &pb.Backfill{
-		Id: "1",
-		SearchFields: &pb.SearchFields{
-			DoubleArgs: map[string]float64{
-				"test-arg": 1,
-			},
-		},
-	}
-
-	store, closer := statestoreTesting.NewStoreServiceForTesting(t, viper.New())
-	defer closer()
-	ctx := context.Background()
-
-	err := store.CreateBackfill(ctx, fakeBackfill, []string{})
-	require.NoError(t, err)
-
-	cfg := viper.New()
-	fs := frontendService{cfg, store}
-
-	tests := []struct {
-		description string
-		id          string
-		wantCode    codes.Code
-	}{
-		{
-			description: "expect ok code since delete backfill does not care about if backfill exists or not",
-			id:          "222",
-			wantCode:    codes.OK,
-		},
-		{
-			description: "expect ok code",
-			id:          "1",
-			wantCode:    codes.OK,
-		},
-	}
-
-	for _, test := range tests {
-		test := test
-		t.Run(test.description, func(t *testing.T) {
-			_, err := fs.DeleteBackfill(ctx, &pb.DeleteBackfillRequest{BackfillId: fakeBackfill.GetId()})
-			require.NoError(t, err)
-			require.Equal(t, test.wantCode.String(), status.Convert(err).Code().String())
-		})
-	}
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
yfei1	5170341b3e	Disabled redis when generating static yaml resources except core (#1099 ) * Disabled redis when generating static yaml resources except core * mitigate cloudbuild error	2020-02-03 18:32:57 -08:00
yfei1	1dbbfd9326	Release 0.9 (#1098 )	2020-02-03 16:28:18 -08:00
				`@ -1 +0,0 @@`
				`* @laremere @aLekSer @HazWard @calebatwd @syntxerror @sawagh @andrewgrundy`